From: cloudwalk Date: Sat, 4 Jul 2020 14:09:36 +0000 (+0000) Subject: Rename parameter of SV_SpawnServer for clarity X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=92fe331d49472a9d956faded7f320204d88a020a;p=xonotic%2Fdarkplaces.git Rename parameter of SV_SpawnServer for clarity git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12785 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/sv_main.c b/sv_main.c index e2ec76bf..5551acb5 100644 --- a/sv_main.c +++ b/sv_main.c @@ -3406,7 +3406,7 @@ This is called at the start of each level ================ */ -void SV_SpawnServer (const char *server) +void SV_SpawnServer (const char *map) { prvm_prog_t *prog = SVVM_prog; prvm_edict_t *ent; @@ -3416,16 +3416,16 @@ void SV_SpawnServer (const char *server) char modelname[sizeof(sv.worldname)]; char vabuf[1024]; - Con_DPrintf("SpawnServer: %s\n", server); + Con_DPrintf("SpawnServer: %s\n", map); - dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server); + dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", map); if (!FS_FileExists(modelname)) { - dpsnprintf (modelname, sizeof(modelname), "maps/%s", server); + dpsnprintf (modelname, sizeof(modelname), "maps/%s", map); if (!FS_FileExists(modelname)) { - Con_Printf("SpawnServer: no map file named maps/%s.bsp\n", server); + Con_Printf("SpawnServer: no map file named maps/%s.bsp\n", map); return; } } @@ -3530,7 +3530,7 @@ void SV_SpawnServer (const char *server) sv.active = true; // set level base name variables for later use - strlcpy (sv.name, server, sizeof (sv.name)); + strlcpy (sv.name, map, sizeof (sv.name)); strlcpy(sv.worldname, modelname, sizeof(sv.worldname)); FS_StripExtension(sv.worldname, sv.worldnamenoextension, sizeof(sv.worldnamenoextension)); strlcpy(sv.worldbasename, !strncmp(sv.worldnamenoextension, "maps/", 5) ? sv.worldnamenoextension + 5 : sv.worldnamenoextension, sizeof(sv.worldbasename));