X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=45bd0137d95daa69c68dbfd503c8758190e3b817;hb=63f63b8fdbc839ab5da9f3eccda24817d4ebc7be;hp=82d64cb839fad961b35462ec17b6c75af84583e2;hpb=ad37bc7de1dce1d858f74df2d70dc214983fb934;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 82d64cb8..45bd0137 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -20,9 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // cl_parse.c -- parse a message received from the server #include "quakedef.h" -#ifdef CONFIG_CD #include "cdaudio.h" -#endif #include "cl_collision.h" #include "csprogs.h" #include "libcurl.h" @@ -166,37 +164,37 @@ const char *qw_svc_strings[128] = //============================================================================= -cvar_t cl_worldmessage = {CVAR_READONLY, "cl_worldmessage", "", "title of current level"}; -cvar_t cl_worldname = {CVAR_READONLY, "cl_worldname", "", "name of current worldmodel"}; -cvar_t cl_worldnamenoextension = {CVAR_READONLY, "cl_worldnamenoextension", "", "name of current worldmodel without extension"}; -cvar_t cl_worldbasename = {CVAR_READONLY, "cl_worldbasename", "", "name of current worldmodel without maps/ prefix or extension"}; - -cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-10 (higher for more info, 10 being the most verbose)"}; -cvar_t cl_gameplayfix_soundsmovewithentities = {0, "cl_gameplayfix_soundsmovewithentities", "1", "causes sounds made by lifts, players, projectiles, and any other entities, to move with the entity, so for example a rocket noise follows the rocket rather than staying at the starting position"}; -cvar_t cl_sound_wizardhit = {0, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"}; -cvar_t cl_sound_hknighthit = {0, "cl_sound_hknighthit", "hknight/hit.wav", "sound to play during TE_KNIGHTSPIKE (empty cvar disables sound)"}; -cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to play with 80% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; -cvar_t cl_sound_ric1 = {0, "cl_sound_ric1", "weapons/ric1.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; -cvar_t cl_sound_ric2 = {0, "cl_sound_ric2", "weapons/ric2.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; -cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; -cvar_t cl_readpicture_force = {0, "cl_readpicture_force", "0", "when enabled, the low quality pictures read by ReadPicture() are preferred over the high quality pictures on the file system"}; +cvar_t cl_worldmessage = {CVAR_CLIENT | CVAR_READONLY, "cl_worldmessage", "", "title of current level"}; +cvar_t cl_worldname = {CVAR_CLIENT | CVAR_READONLY, "cl_worldname", "", "name of current worldmodel"}; +cvar_t cl_worldnamenoextension = {CVAR_CLIENT | CVAR_READONLY, "cl_worldnamenoextension", "", "name of current worldmodel without extension"}; +cvar_t cl_worldbasename = {CVAR_CLIENT | CVAR_READONLY, "cl_worldbasename", "", "name of current worldmodel without maps/ prefix or extension"}; + +cvar_t developer_networkentities = {CVAR_CLIENT, "developer_networkentities", "0", "prints received entities, value is 0-10 (higher for more info, 10 being the most verbose)"}; +cvar_t cl_gameplayfix_soundsmovewithentities = {CVAR_CLIENT, "cl_gameplayfix_soundsmovewithentities", "1", "causes sounds made by lifts, players, projectiles, and any other entities, to move with the entity, so for example a rocket noise follows the rocket rather than staying at the starting position"}; +cvar_t cl_sound_wizardhit = {CVAR_CLIENT, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"}; +cvar_t cl_sound_hknighthit = {CVAR_CLIENT, "cl_sound_hknighthit", "hknight/hit.wav", "sound to play during TE_KNIGHTSPIKE (empty cvar disables sound)"}; +cvar_t cl_sound_tink1 = {CVAR_CLIENT, "cl_sound_tink1", "weapons/tink1.wav", "sound to play with 80% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; +cvar_t cl_sound_ric1 = {CVAR_CLIENT, "cl_sound_ric1", "weapons/ric1.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; +cvar_t cl_sound_ric2 = {CVAR_CLIENT, "cl_sound_ric2", "weapons/ric2.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; +cvar_t cl_sound_ric3 = {CVAR_CLIENT, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; +cvar_t cl_readpicture_force = {CVAR_CLIENT, "cl_readpicture_force", "0", "when enabled, the low quality pictures read by ReadPicture() are preferred over the high quality pictures on the file system"}; #define RIC_GUNSHOT 1 #define RIC_GUNSHOTQUAD 2 -cvar_t cl_sound_ric_gunshot = {0, "cl_sound_ric_gunshot", "0", "specifies if and when the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD, 0 = no sound, 1 = TE_GUNSHOT, 2 = TE_GUNSHOTQUAD, 3 = TE_GUNSHOT and TE_GUNSHOTQUAD"}; -cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"}; -cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"}; -cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"}; -cvar_t cl_nettimesyncfactor = {CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"}; -cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "6", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slighttly nicer version of Quake3 method, 6 = bounding + Quake3"}; -cvar_t cl_nettimesyncboundtolerance = {CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"}; -cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"}; +cvar_t cl_sound_ric_gunshot = {CVAR_CLIENT, "cl_sound_ric_gunshot", "0", "specifies if and when the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD, 0 = no sound, 1 = TE_GUNSHOT, 2 = TE_GUNSHOTQUAD, 3 = TE_GUNSHOT and TE_GUNSHOTQUAD"}; +cvar_t cl_sound_r_exp3 = {CVAR_CLIENT, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"}; +cvar_t cl_serverextension_download = {CVAR_CLIENT, "cl_serverextension_download", "0", "indicates whether the server supports the download command"}; +cvar_t cl_joinbeforedownloadsfinish = {CVAR_CLIENT | CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"}; +cvar_t cl_nettimesyncfactor = {CVAR_CLIENT | CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"}; +cvar_t cl_nettimesyncboundmode = {CVAR_CLIENT | CVAR_SAVE, "cl_nettimesyncboundmode", "6", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slighttly nicer version of Quake3 method, 6 = bounding + Quake3"}; +cvar_t cl_nettimesyncboundtolerance = {CVAR_CLIENT | CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"}; +cvar_t cl_iplog_name = {CVAR_CLIENT | CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"}; static qboolean QW_CL_CheckOrDownloadFile(const char *filename); static void QW_CL_RequestNextDownload(void); -static void QW_CL_NextUpload(void); +static void QW_CL_NextUpload_f(cmd_state_t *cmd); //static qboolean QW_CL_IsUploading(void); -static void QW_CL_StopUpload(void); +static void QW_CL_StopUpload_f(cmd_state_t *cmd); /* ================== @@ -366,7 +364,7 @@ void CL_KeepaliveMessage (qboolean readmessages) unsigned char buf[4]; countdownmsg = 5; // write out a nop - // LordHavoc: must use unreliable because reliable could kill the sigon message! + // LadyHavoc: must use unreliable because reliable could kill the sigon message! Con_Print("--> client to server keepalive\n"); memset(&msg, 0, sizeof(msg)); msg.data = buf; @@ -383,8 +381,8 @@ void CL_ParseEntityLump(char *entdata) qboolean loadedsky = false; const char *data; char key[128], value[MAX_INPUTLINE]; - FOG_clear(); // LordHavoc: no fog until set - // LordHavoc: default to the map's sky (q3 shader parsing sets this) + FOG_clear(); // LadyHavoc: no fog until set + // LadyHavoc: default to the map's sky (q3 shader parsing sets this) R_SetSkyBox(cl.worldmodel->brush.skybox); data = entdata; if (!data) @@ -502,7 +500,7 @@ static void CL_SetupWorldModel(void) World_Start(&cl.world); // load or reload .loc file for team chat messages - CL_Locs_Reload_f(); + CL_Locs_Reload_f(&cmd_client); // make sure we send enough keepalives CL_KeepaliveMessage(false); @@ -887,14 +885,14 @@ static void QW_CL_ParseSoundList(void) QW_CL_RequestNextDownload(); } -static void QW_CL_Skins_f(void) +static void QW_CL_Skins_f(cmd_state_t *cmd) { cls.qw_downloadnumber = 0; cls.qw_downloadtype = dl_skin; QW_CL_RequestNextDownload(); } -static void QW_CL_Changing_f(void) +static void QW_CL_Changing_f(cmd_state_t *cmd) { if (cls.qw_downloadmemory) // don't change when downloading return; @@ -905,7 +903,7 @@ static void QW_CL_Changing_f(void) Con_Printf("\nChanging map...\n"); } -void QW_CL_NextUpload(void) +void QW_CL_NextUpload_f(cmd_state_t *cmd) { int r, percent, size; @@ -932,7 +930,7 @@ void QW_CL_NextUpload(void) Con_Printf("Upload completed\n"); - QW_CL_StopUpload(); + QW_CL_StopUpload_f(cmd); } void QW_CL_StartUpload(unsigned char *data, int size) @@ -942,7 +940,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) return; // abort existing upload if in progress - QW_CL_StopUpload(); + QW_CL_StopUpload_f(&cmd_client); Con_DPrintf("Starting upload of %d bytes...\n", size); @@ -951,7 +949,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) cls.qw_uploadsize = size; cls.qw_uploadpos = 0; - QW_CL_NextUpload(); + QW_CL_NextUpload_f(&cmd_client); } #if 0 @@ -961,7 +959,7 @@ qboolean QW_CL_IsUploading(void) } #endif -void QW_CL_StopUpload(void) +void QW_CL_StopUpload_f(cmd_state_t *cmd) { if (cls.qw_uploaddata) Mem_Free(cls.qw_uploaddata); @@ -1097,7 +1095,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) // if we got here... // curl is done, so let's start with the business if(!cl.loadbegun) - SCR_PushLoadingScreen(false, "Loading precaches", 1); + SCR_PushLoadingScreen("Loading precaches", 1); cl.loadbegun = true; // if already downloading something from the previous level, don't stop it @@ -1132,7 +1130,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) if(cl.loadmodel_current == 1) { // worldmodel counts as 16 models (15 + world model setup), for better progress bar - SCR_PushLoadingScreen(false, "Loading precached models", + SCR_PushLoadingScreen("Loading precached models", ( (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL + LOADPROGRESSWEIGHT_WORLDMODEL @@ -1144,11 +1142,10 @@ static void CL_BeginDownloads(qboolean aborteddownload) + cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND ) ); - SCR_BeginLoadingPlaque(false); } for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++) { - SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current], + SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current], ( (cl.loadmodel_current == 1) ? LOADPROGRESSWEIGHT_WORLDMODEL : LOADPROGRESSWEIGHT_MODEL ) / ( @@ -1162,7 +1159,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) SCR_PopLoadingScreen(false); if(cl.loadmodel_current == 1) { - SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total); + SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total); SCR_PopLoadingScreen(false); } continue; @@ -1185,7 +1182,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1) { // we now have the worldmodel so we can set up the game world - SCR_PushLoadingScreen(true, "world model setup", + SCR_PushLoadingScreen("world model setup", ( LOADPROGRESSWEIGHT_WORLDMODEL_INIT ) / ( @@ -1213,7 +1210,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) { // loading sounds if(cl.loadsound_current == 1) - SCR_PushLoadingScreen(false, "Loading precached sounds", + SCR_PushLoadingScreen("Loading precached sounds", ( cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND ) / ( @@ -1225,7 +1222,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) ); for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++) { - SCR_PushLoadingScreen(false, cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total); + SCR_PushLoadingScreen(cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total); if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current])) { SCR_PopLoadingScreen(false); @@ -1368,7 +1365,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) } } -static void CL_BeginDownloads_f(void) +static void CL_BeginDownloads_f(cmd_state_t *cmd) { // prevent cl_begindownloads from being issued multiple times in one match // to prevent accidentally cancelled downloads @@ -1511,11 +1508,11 @@ static void CL_ParseDownload(void) cls.qw_downloadspeedcount += size; } -static void CL_DownloadBegin_f(void) +static void CL_DownloadBegin_f(cmd_state_t *cmd) { - int size = atoi(Cmd_Argv(1)); + int size = atoi(Cmd_Argv(cmd, 1)); - if (size < 0 || size > 1<<30 || FS_CheckNastyPath(Cmd_Argv(2), false)) + if (size < 0 || size > 1<<30 || FS_CheckNastyPath(Cmd_Argv(cmd, 2), false)) { Con_Printf("cl_downloadbegin: received bogus information\n"); CL_StopDownload(0, 0); @@ -1528,15 +1525,15 @@ static void CL_DownloadBegin_f(void) CL_StopDownload(0, 0); // we're really beginning a download now, so initialize stuff - strlcpy(cls.qw_downloadname, Cmd_Argv(2), sizeof(cls.qw_downloadname)); + strlcpy(cls.qw_downloadname, Cmd_Argv(cmd, 2), sizeof(cls.qw_downloadname)); cls.qw_downloadmemorymaxsize = size; cls.qw_downloadmemory = (unsigned char *) Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize); cls.qw_downloadnumber++; cls.qw_download_deflate = false; - if(Cmd_Argc() >= 4) + if(Cmd_Argc(cmd) >= 4) { - if(!strcmp(Cmd_Argv(3), "deflate")) + if(!strcmp(Cmd_Argv(cmd, 3), "deflate")) cls.qw_download_deflate = true; // check further encodings here } @@ -1544,7 +1541,7 @@ static void CL_DownloadBegin_f(void) Cmd_ForwardStringToServer("sv_startdownload"); } -static void CL_StopDownload_f(void) +static void CL_StopDownload_f(cmd_state_t *cmd) { Curl_CancelAll(); if (cls.qw_downloadname[0]) @@ -1555,14 +1552,14 @@ static void CL_StopDownload_f(void) CL_BeginDownloads(true); } -static void CL_DownloadFinished_f(void) +static void CL_DownloadFinished_f(cmd_state_t *cmd) { - if (Cmd_Argc() < 3) + if (Cmd_Argc(cmd) < 3) { Con_Printf("Malformed cl_downloadfinished command\n"); return; } - CL_StopDownload(atoi(Cmd_Argv(1)), atoi(Cmd_Argv(2))); + CL_StopDownload(atoi(Cmd_Argv(cmd, 1)), atoi(Cmd_Argv(cmd, 2))); CL_BeginDownloads(false); } @@ -1621,7 +1618,7 @@ static void CL_SignonReply (void) // execute cl_begindownloads next frame // (after any commands added by svc_stufftext have been executed) // when done with downloads the "prespawn" will be sent - Cbuf_AddText("\ncl_begindownloads\n"); + Cbuf_AddText(&cmd_client, "\ncl_begindownloads\n"); //MSG_WriteByte (&cls.netcon->message, clc_stringcmd); //MSG_WriteString (&cls.netcon->message, "prespawn"); @@ -1633,11 +1630,11 @@ static void CL_SignonReply (void) case 2: if (cls.netcon) { - // LordHavoc: quake sent the player info here but due to downloads + // LadyHavoc: quake sent the player info here but due to downloads // it is sent earlier instead // CL_SendPlayerInfo(); - // LordHavoc: changed to begin a loading stage and issue this when done + // LadyHavoc: changed to begin a loading stage and issue this when done MSG_WriteByte (&cls.netcon->message, clc_stringcmd); MSG_WriteString (&cls.netcon->message, "spawn"); } @@ -1922,7 +1919,7 @@ static void CL_ParseServerInfo (void) if (cls.demorecording) { // finish the previous level's demo file - CL_Stop_f(); + CL_Stop_f(&cmd_client); } // start a new demo file @@ -1948,7 +1945,7 @@ static void CL_ParseServerInfo (void) cls.demo_lastcsprogscrc = -1; } else - Con_Print ("ERROR: couldn't open.\n"); + Con_Error ("ERROR: couldn't open.\n"); } } cl.islocalgame = NetConn_IsLocalGame(); @@ -2204,7 +2201,7 @@ static void CL_ParseClientdata (void) } } - // LordHavoc: hipnotic demos don't have this bit set but should + // LadyHavoc: hipnotic demos don't have this bit set but should if (bits & SU_ITEMS || cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5) cl.stats[STAT_ITEMS] = MSG_ReadLong(&cl_message); @@ -2657,7 +2654,7 @@ static void CL_ParseTempEntity(void) S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); } break; - // LordHavoc: added for improved blood splatters + // LadyHavoc: added for improved blood splatters case TE_BLOOD: // blood puff MSG_ReadVector(&cl_message, pos, cls.protocol); @@ -2683,7 +2680,7 @@ static void CL_ParseTempEntity(void) CL_FindNonSolidLocation(pos, pos, 4); CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); break; - // LordHavoc: added for improved gore + // LadyHavoc: added for improved gore case TE_BLOODSHOWER: // vaporized body MSG_ReadVector(&cl_message, pos, cls.protocol); // mins @@ -2872,7 +2869,7 @@ static void CL_ParseTempEntity(void) break; // PGM 01/21/97 - // LordHavoc: for compatibility with the Nehahra movie... + // LadyHavoc: for compatibility with the Nehahra movie... case TE_LIGHTNING4NEH: CL_ParseBeam(Mod_ForName(MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), true, false, NULL), false); break; @@ -3096,18 +3093,18 @@ static void CL_IPLog_Load(void) } } -static void CL_IPLog_List_f(void) +static void CL_IPLog_List_f(cmd_state_t *cmd) { int i, j; const char *addressprefix; - if (Cmd_Argc() > 2) + if (Cmd_Argc(cmd) > 2) { - Con_Printf("usage: %s 123.456.789.\n", Cmd_Argv(0)); + Con_Printf("usage: %s 123.456.789.\n", Cmd_Argv(cmd, 0)); return; } addressprefix = ""; - if (Cmd_Argc() >= 2) - addressprefix = Cmd_Argv(1); + if (Cmd_Argc(cmd) >= 2) + addressprefix = Cmd_Argv(cmd, 1); if (!cl_iplog_loaded) CL_IPLog_Load(); if (addressprefix && addressprefix[0]) @@ -3401,7 +3398,7 @@ void CL_ParseServerMessage(void) qboolean strip_pqc; char vabuf[1024]; - // LordHavoc: moved demo message writing from before the packet parse to + // LadyHavoc: moved demo message writing from before the packet parse to // after the packet parse so that CL_Stop_f can be called by cl_autodemo // code in CL_ParseServerinfo //if (cls.demorecording) @@ -3461,7 +3458,7 @@ void CL_ParseServerMessage(void) cmdlogname[cmdindex] = qw_svc_strings[cmd]; if (!cmdlogname[cmdindex]) { - // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + // LadyHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) const char *d = ""; cmdlogname[cmdindex] = d; } @@ -3642,12 +3639,10 @@ void CL_ParseServerMessage(void) case qw_svc_cdtrack: cl.cdtrack = cl.looptrack = MSG_ReadByte(&cl_message); -#ifdef CONFIG_CD if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) CDAudio_Play ((unsigned char)cls.forcetrack, true); else CDAudio_Play ((unsigned char)cl.cdtrack, true); -#endif break; case qw_svc_intermission: @@ -3667,7 +3662,7 @@ void CL_ParseServerMessage(void) break; case qw_svc_sellscreen: - Cmd_ExecuteString ("help", src_command, true); + Cmd_ExecuteString(&cmd_client, "help", src_command, true); break; case qw_svc_smallkick: @@ -3766,12 +3761,10 @@ void CL_ParseServerMessage(void) case qw_svc_setpause: cl.paused = MSG_ReadByte(&cl_message) != 0; -#ifdef CONFIG_CD if (cl.paused) CDAudio_Pause (); else CDAudio_Resume (); -#endif S_PauseGameSounds (cl.paused); break; } @@ -3808,7 +3801,7 @@ void CL_ParseServerMessage(void) // if the high bit of the command byte is set, it is a fast update if (cmd & 128) { - // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + // LadyHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) temp = "entity"; cmdlogname[cmdindex] = temp; SHOWNET("fast update"); @@ -3826,7 +3819,7 @@ void CL_ParseServerMessage(void) cmdlogname[cmdindex] = svc_strings[cmd]; if (!cmdlogname[cmdindex]) { - // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + // LadyHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) const char *d = ""; cmdlogname[cmdindex] = d; } @@ -3966,7 +3959,7 @@ void CL_ParseServerMessage(void) Host_Error("svc_setview >= MAX_EDICTS"); if (cl.viewentity >= cl.max_entities) CL_ExpandEntities(cl.viewentity); - // LordHavoc: assume first setview recieved is the real player entity + // LadyHavoc: assume first setview recieved is the real player entity if (!cl.realplayerentity) cl.realplayerentity = cl.viewentity; // update cl.playerentity to this one if it is a valid player @@ -4096,18 +4089,16 @@ void CL_ParseServerMessage(void) case svc_setpause: cl.paused = MSG_ReadByte(&cl_message) != 0; -#ifdef CONFIG_CD if (cl.paused) CDAudio_Pause (); else CDAudio_Resume (); -#endif S_PauseGameSounds (cl.paused); break; case svc_signonnum: i = MSG_ReadByte(&cl_message); - // LordHavoc: it's rude to kick off the client if they missed the + // LadyHavoc: it's rude to kick off the client if they missed the // reconnect somehow, so allow signon 1 even if at signon 1 if (i <= cls.signon && i != 1) Host_Error ("Received signon %i when at %i", i, cls.signon); @@ -4148,12 +4139,10 @@ void CL_ParseServerMessage(void) case svc_cdtrack: cl.cdtrack = MSG_ReadByte(&cl_message); cl.looptrack = MSG_ReadByte(&cl_message); -#ifdef CONFIG_CD if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) CDAudio_Play ((unsigned char)cls.forcetrack, true); else CDAudio_Play ((unsigned char)cl.cdtrack, true); -#endif break; case svc_intermission: @@ -4180,7 +4169,7 @@ void CL_ParseServerMessage(void) break; case svc_sellscreen: - Cmd_ExecuteString ("help", src_command, true); + Cmd_ExecuteString(&cmd_client, "help", src_command, true); break; case svc_hidelmp: if (gamemode == GAME_TENEBRAE) @@ -4262,7 +4251,7 @@ void CL_ParseServerMessage(void) parsingerror = false; - // LordHavoc: this was at the start of the function before cl_autodemo was + // LadyHavoc: this was at the start of the function before cl_autodemo was // implemented if (cls.demorecording) { @@ -4283,7 +4272,7 @@ void CL_Parse_DumpPacket(void) void CL_Parse_ErrorCleanUp(void) { CL_StopDownload(0, 0); - QW_CL_StopUpload(); + QW_CL_StopUpload_f(&cmd_client); } void CL_Parse_Init(void) @@ -4316,15 +4305,19 @@ void CL_Parse_Init(void) Cvar_RegisterVariable(&cl_iplog_name); Cvar_RegisterVariable(&cl_readpicture_force); - Cmd_AddCommand("nextul", QW_CL_NextUpload, "sends next fragment of current upload buffer (screenshot for example)"); - Cmd_AddCommand("stopul", QW_CL_StopUpload, "aborts current upload (screenshot for example)"); - Cmd_AddCommand("skins", QW_CL_Skins_f, "downloads missing qw skins from server"); - Cmd_AddCommand("changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change"); - Cmd_AddCommand("cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)"); - Cmd_AddCommand("cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer"); - Cmd_AddCommand("stopdownload", CL_StopDownload_f, "terminates a download"); - Cmd_AddCommand("cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity"); - Cmd_AddCommand("iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)"); + Cmd_AddCommand(&cmd_client, "nextul", QW_CL_NextUpload_f, "sends next fragment of current upload buffer (screenshot for example)"); + Cmd_AddCommand(&cmd_client, "stopul", QW_CL_StopUpload_f, "aborts current upload (screenshot for example)"); + Cmd_AddCommand(&cmd_client, "skins", QW_CL_Skins_f, "downloads missing qw skins from server"); + Cmd_AddCommand(&cmd_clientfromserver, "skins", QW_CL_Skins_f, "downloads missing qw skins from server"); + Cmd_AddCommand(&cmd_client, "changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change"); + Cmd_AddCommand(&cmd_client, "cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)"); + Cmd_AddCommand(&cmd_client, "cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer"); + Cmd_AddCommand(&cmd_clientfromserver, "cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer"); + Cmd_AddCommand(&cmd_client, "stopdownload", CL_StopDownload_f, "terminates a download"); + Cmd_AddCommand(&cmd_clientfromserver, "stopdownload", CL_StopDownload_f, "terminates a download"); + Cmd_AddCommand(&cmd_client, "cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity"); + Cmd_AddCommand(&cmd_clientfromserver, "cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity"); + Cmd_AddCommand(&cmd_client, "iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)"); } void CL_Parse_Shutdown(void)