From 775c0f6d056c37d2e23f9a96ec827023fe5e3404 Mon Sep 17 00:00:00 2001 From: cloudwalk Date: Tue, 20 Apr 2021 18:39:54 +0000 Subject: [PATCH] cmd: Merge cmd_client and cmd_server into cmd_local. Third time's a charm. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@13129 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_demo.c | 6 ++--- cl_main.c | 6 ++--- cl_parse.c | 16 ++++++------ clvm_cmds.c | 4 +-- cmd.c | 72 ++++++++++++++++++++++++++++++---------------------- cmd.h | 7 ++--- csprogs.c | 14 +++++----- cvar.c | 4 +-- fs.c | 6 ++--- gl_rmain.c | 4 +-- host.c | 30 +++++++++++----------- keys.c | 8 +++--- libcurl.c | 14 +++++----- menu.c | 6 ++--- mvm_cmds.c | 4 +-- netconn.c | 2 +- progsvm.h | 2 +- prvm_cmds.c | 21 ++++++++------- prvm_cmds.h | 2 +- r_shadow.c | 6 ++--- sv_ccmds.c | 2 +- sv_main.c | 2 +- svvm_cmds.c | 2 +- sys_shared.c | 6 ++--- vid_sdl.c | 4 +-- 25 files changed, 128 insertions(+), 122 deletions(-) diff --git a/cl_demo.c b/cl_demo.c index a3be2148..f8fbe5b5 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -67,7 +67,7 @@ void CL_NextDemo (void) } dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]); - Cbuf_InsertText(cmd_client, str); + Cbuf_InsertText(cmd_local, str); cls.demonum++; } @@ -274,7 +274,7 @@ void CL_ReadDemoMessage(void) CL_ParseServerMessage(); if (cls.signon != SIGNONS) - Cbuf_Execute((cmd_client)->cbuf); // immediately execute svc_stufftext if in the demo before connect! + Cbuf_Execute((cmd_local)->cbuf); // immediately execute svc_stufftext if in the demo before connect! // In case the demo contains a "svc_disconnect" message if (!cls.demoplayback) @@ -531,7 +531,7 @@ static void CL_FinishTimeDemo (void) if(atoi(sys.argv[i + 1]) > benchmark_runs) { // restart the benchmark - Cbuf_AddText(cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", cls.demoname)); + Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "timedemo %s\n", cls.demoname)); // cannot execute here } else diff --git a/cl_main.c b/cl_main.c index c55c543e..e468e92a 100644 --- a/cl_main.c +++ b/cl_main.c @@ -397,7 +397,7 @@ void CL_Disconnect(void) sizebuf_t buf; unsigned char bufdata[8]; if (cls.demorecording) - CL_Stop_f(cmd_client); + CL_Stop_f(cmd_local); // send disconnect message 3 times to improve chances of server // receiving it (but it still fails sometimes) @@ -555,8 +555,8 @@ void CL_EstablishConnection(const char *address, int firstarg) { int i; *cls.connect_userinfo = 0; - for(i = firstarg; i+2 <= Cmd_Argc(cmd_client); i += 2) - InfoString_SetValue(cls.connect_userinfo, sizeof(cls.connect_userinfo), Cmd_Argv(cmd_client, i), Cmd_Argv(cmd_client, i+1)); + for(i = firstarg; i+2 <= Cmd_Argc(cmd_local); i += 2) + InfoString_SetValue(cls.connect_userinfo, sizeof(cls.connect_userinfo), Cmd_Argv(cmd_local, i), Cmd_Argv(cmd_local, i+1)); } else if(firstarg < -1) { diff --git a/cl_parse.c b/cl_parse.c index 98c415ab..39d1bbe4 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -500,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(cmd_client); + CL_Locs_Reload_f(cmd_local); // make sure we send enough keepalives CL_KeepaliveMessage(false); @@ -940,7 +940,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) return; // abort existing upload if in progress - QW_CL_StopUpload_f(cmd_client); + QW_CL_StopUpload_f(cmd_local); Con_DPrintf("Starting upload of %d bytes...\n", size); @@ -949,7 +949,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) cls.qw_uploadsize = size; cls.qw_uploadpos = 0; - QW_CL_NextUpload_f(cmd_client); + QW_CL_NextUpload_f(cmd_local); } #if 0 @@ -1619,7 +1619,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(cmd_client, "\ncl_begindownloads\n"); + Cbuf_AddText(cmd_local, "\ncl_begindownloads\n"); //MSG_WriteByte (&cls.netcon->message, clc_stringcmd); //MSG_WriteString (&cls.netcon->message, "prespawn"); @@ -1920,7 +1920,7 @@ static void CL_ParseServerInfo (void) if (cls.demorecording) { // finish the previous level's demo file - CL_Stop_f(cmd_client); + CL_Stop_f(cmd_local); } // start a new demo file @@ -3695,7 +3695,7 @@ void CL_ParseServerMessage(void) break; case qw_svc_sellscreen: - Cmd_ExecuteString(cmd_client, "help", src_local, true); + Cmd_ExecuteString(cmd_local, "help", src_local, true); break; case qw_svc_smallkick: @@ -4204,7 +4204,7 @@ void CL_ParseServerMessage(void) break; case svc_sellscreen: - Cmd_ExecuteString(cmd_client, "help", src_local, true); + Cmd_ExecuteString(cmd_local, "help", src_local, true); break; case svc_hidelmp: if (gamemode == GAME_TENEBRAE) @@ -4307,7 +4307,7 @@ void CL_Parse_DumpPacket(void) void CL_Parse_ErrorCleanUp(void) { CL_StopDownload(0, 0); - QW_CL_StopUpload_f(cmd_client); + QW_CL_StopUpload_f(cmd_local); } void CL_Parse_Init(void) diff --git a/clvm_cmds.c b/clvm_cmds.c index ff68d4f8..1be822db 100644 --- a/clvm_cmds.c +++ b/clvm_cmds.c @@ -2402,7 +2402,7 @@ static void VM_CL_setlistener (prvm_prog_t *prog) static void VM_CL_registercmd (prvm_prog_t *prog) { VM_SAFEPARMCOUNT(1, VM_CL_registercmd); - if(!Cmd_Exists(cmd_client, PRVM_G_STRING(OFS_PARM0))) + if(!Cmd_Exists(cmd_local, PRVM_G_STRING(OFS_PARM0))) Cmd_AddCommand(CF_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC"); } @@ -4982,7 +4982,7 @@ NULL, // #42 (QUAKE) VM_fabs, // #43 float(float f) fabs (QUAKE) NULL, // #44 vector(entity e, float speed) aim (QUAKE) VM_cvar, // #45 float(string s) cvar (QUAKE) -VM_localcmd_client, // #46 void(string s) localcmd (QUAKE) +VM_localcmd_local, // #46 void(string s) localcmd (QUAKE) VM_nextent, // #47 entity(entity e) nextent (QUAKE) VM_CL_particle, // #48 void(vector o, vector d, float color, float count) particle (QUAKE) VM_changeyaw, // #49 void() ChangeYaw (QUAKE) diff --git a/cmd.c b/cmd.c index 903b923b..7632fa14 100644 --- a/cmd.c +++ b/cmd.c @@ -22,8 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "thread.h" -cmd_state_t *cmd_client; -cmd_state_t *cmd_server; +cmd_state_t *cmd_local; cmd_state_t *cmd_serverfromclient; cmd_userdefined_t cmd_userdefined_all; @@ -503,12 +502,7 @@ static void Cbuf_Frame_Input(void) char *line; while ((line = Sys_ConsoleInput())) - { - if (cls.state == ca_dedicated) - Cbuf_AddText(cmd_server, line); - else - Cbuf_AddText(cmd_client, line); - } + Cbuf_AddText(cmd_local, line); } void Cbuf_Frame(cmd_buf_t *cbuf) @@ -1662,24 +1656,19 @@ void Cmd_Init(void) cbuf->free.prev = cbuf->free.next = &(cbuf->free); // FIXME: Get rid of cmd_iter_all eventually. This is just a hack to reduce the amount of work to make the interpreters dynamic. - cmd_iter_all = (cmd_iter_t *)Mem_Alloc(tempmempool, sizeof(cmd_iter_t) * 4); + cmd_iter_all = (cmd_iter_t *)Mem_Alloc(tempmempool, sizeof(cmd_iter_t) * 3); - // client console can see server cvars because the user may start a server - cmd_iter_all[0].cmd = cmd_client = Cmd_AddInterpreter(cbuf, &cvars_all, CF_CLIENT | CF_SERVER, CF_CLIENT | CF_CLIENT_FROM_SERVER, &cmd_userdefined_all); - cmd_client->Handle = Cmd_CL_Callback; - cmd_client->NotFound = NULL; - - // dedicated server console can only see server cvars, there is no client - cmd_iter_all[1].cmd = cmd_server = Cmd_AddInterpreter(cbuf, &cvars_all, CF_SERVER, CF_SERVER, &cmd_userdefined_all); - cmd_server->Handle = Cmd_SV_Callback; - cmd_server->NotFound = NULL; + // local console + cmd_iter_all[0].cmd = cmd_local = Cmd_AddInterpreter(cbuf, &cvars_all, CF_CLIENT | CF_SERVER, CF_CLIENT | CF_CLIENT_FROM_SERVER | CF_SERVER_FROM_CLIENT, &cmd_userdefined_all); + cmd_local->Handle = Cmd_CL_Callback; + cmd_local->NotFound = NULL; // server commands received from clients have no reason to access cvars, cvar expansion seems perilous. - cmd_iter_all[2].cmd = cmd_serverfromclient = Cmd_AddInterpreter(cbuf, &cvars_null, 0, CF_SERVER_FROM_CLIENT | CF_USERINFO, &cmd_userdefined_null); + cmd_iter_all[1].cmd = cmd_serverfromclient = Cmd_AddInterpreter(cbuf, &cvars_null, 0, CF_SERVER_FROM_CLIENT | CF_USERINFO, &cmd_userdefined_null); cmd_serverfromclient->Handle = Cmd_SV_Callback; cmd_serverfromclient->NotFound = Cmd_SV_NotFound; - cmd_iter_all[3].cmd = NULL; + cmd_iter_all[2].cmd = NULL; // // register our commands // @@ -1850,7 +1839,7 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const cmd_state_t *cmd; int i; - for (i = 0; i < 3; i++) + for (i = 0; i < 2; i++) { cmd = cmd_iter_all[i].cmd; if (flags & cmd->cmd_flags) @@ -2167,6 +2156,18 @@ void Cmd_ClearCSQCCommands (cmd_state_t *cmd) extern cvar_t sv_cheats; +/* + * Cloudwalk FIXME: This idea sounded great in my head but... + * How do we handle commands that can be received by the client, + * but which the server can also execute locally? + * + * If we create a callback where the engine will forward to server + * but try to execute the command locally if it's dedicated, + * we're back to intermixing client and server code which I'm + * trying to avoid. There's no other way I can think of to + * implement that behavior that doesn't involve an #ifdef, or + * making a mess of hooks. + */ qbool Cmd_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) { if (func->function) @@ -2178,15 +2179,27 @@ qbool Cmd_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd qbool Cmd_CL_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) { - if(func->qcfunc && (func->flags & CF_CLIENT)) - return CL_VM_ConsoleCommand(text); - else if ((func->flags & CF_SERVER_FROM_CLIENT) && src == src_local) + // TODO: Assign these functions to QC commands directly? + if(func->qcfunc) { - CL_ForwardToServer_f(cmd); - return true; + if(((func->flags & CF_CLIENT) && CL_VM_ConsoleCommand(text)) || + ((func->flags & CF_SERVER) && SV_VM_ConsoleCommand(text))) + return true; } - else - return Cmd_Callback(cmd, func, text, src); + if (func->flags & CF_SERVER_FROM_CLIENT) + { + if(host_isclient.integer) + { + CL_ForwardToServer_f(cmd); + return true; + } + else if(!(func->flags & CF_SERVER)) + { + Con_Printf("Cannot execute client commands from a dedicated server console.\n"); + return true; + } + } + return Cmd_Callback(cmd, func, text, src); } qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) @@ -2201,8 +2214,7 @@ qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, func->function(cmd); return true; } - else - return Cmd_Callback(cmd, func, text, src); + return false; } qbool Cmd_SV_NotFound(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) diff --git a/cmd.h b/cmd.h index ffcd3c03..58c8a742 100644 --- a/cmd.h +++ b/cmd.h @@ -166,12 +166,9 @@ typedef struct cmd_input_s extern cmd_userdefined_t cmd_userdefined_all; // aliases and csqc functions extern cmd_userdefined_t cmd_userdefined_null; // intentionally empty -// command interpreter for client commands injected by CSQC, MQC or client engine code +// command interpreter for local commands injected by SVQC, CSQC, MQC, server or client engine code // uses cmddefs_all -extern cmd_state_t *cmd_client; -// command interpreter for server commands injected by MQC, SVQC, menu engine code or server engine code -// uses cmddefs_all -extern cmd_state_t *cmd_server; +extern cmd_state_t *cmd_local; // command interpreter for server commands received over network from clients // uses cmddefs_null extern cmd_state_t *cmd_serverfromclient; diff --git a/csprogs.c b/csprogs.c index 3c90ff13..08b67d93 100644 --- a/csprogs.c +++ b/csprogs.c @@ -555,7 +555,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) int crcflags = csqc_progcrc.flags; csqc_progcrc.flags &= ~CF_READONLY; csqc_progsize.flags &= ~CF_READONLY; - Cmd_ExecuteString(cmd_client, msg, src_local, true); + Cmd_ExecuteString(cmd_local, msg, src_local, true); csqc_progcrc.flags = csqc_progsize.flags = crcflags; return; } @@ -587,7 +587,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) l = sizeof(buf) - 1; strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline! - Cmd_ExecuteString(cmd_client, buf, src_local, true); + Cmd_ExecuteString(cmd_local, buf, src_local, true); p += l; if(*p == '\n') @@ -595,13 +595,13 @@ void CL_VM_Parse_StuffCmd (const char *msg) else break; // end of string or overflow } - Cmd_ExecuteString(cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading + Cmd_ExecuteString(cmd_local, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading return; } if(!cl.csqc_loaded) { - Cbuf_AddText(cmd_client, msg); + Cbuf_AddText(cmd_local, msg); return; } CSQC_BEGIN @@ -615,7 +615,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - Cbuf_AddText(cmd_client, msg); + Cbuf_AddText(cmd_local, msg); CSQC_END } @@ -1040,7 +1040,7 @@ void CL_VM_Init (void) return; } - PRVM_Prog_Init(prog, cmd_client); + PRVM_Prog_Init(prog, cmd_local); // allocate the mempools prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL); @@ -1140,7 +1140,7 @@ void CL_VM_Init (void) void CL_VM_ShutDown (void) { prvm_prog_t *prog = CLVM_prog; - Cmd_ClearCSQCCommands(cmd_client); + Cmd_ClearCSQCCommands(cmd_local); //Cvar_SetValueQuick(&csqc_progcrc, -1); //Cvar_SetValueQuick(&csqc_progsize, -1); if(!cl.csqc_loaded) diff --git a/cvar.c b/cvar.c index b4f18c6b..68c65441 100644 --- a/cvar.c +++ b/cvar.c @@ -621,7 +621,7 @@ void Cvar_RegisterVariable (cvar_t *variable) } // check for overlap with a command - if (Cmd_Exists(cmd_client, variable->name) || Cmd_Exists(cmd_server, variable->name)) + if (Cmd_Exists(cmd_local, variable->name) || Cmd_Exists(cmd_local, variable->name)) { Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name); return; @@ -685,7 +685,7 @@ cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int f } // check for overlap with a command - if (Cmd_Exists(cmd_client, name) || Cmd_Exists(cmd_server, name)) + if (Cmd_Exists(cmd_local, name) || Cmd_Exists(cmd_local, name)) { Con_Printf("Cvar_Get: %s is a command\n", name); return NULL; diff --git a/fs.c b/fs.c index 182d05f3..a925ff31 100644 --- a/fs.c +++ b/fs.c @@ -1574,15 +1574,15 @@ qbool FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qbool compl if (cls.demoplayback) { - CL_Disconnect_f(cmd_client); + CL_Disconnect_f(cmd_local); cls.demonum = 0; } // unload all sounds so they will be reloaded from the new files as needed - S_UnloadAllSounds_f(cmd_client); + S_UnloadAllSounds_f(cmd_local); // restart the video subsystem after the config is executed - Cbuf_InsertText(cmd_client, "\nloadconfig\nvid_restart\n\n"); + Cbuf_InsertText(cmd_local, "\nloadconfig\nvid_restart\n\n"); return true; } diff --git a/gl_rmain.c b/gl_rmain.c index 6b37179e..3efa46d2 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -3197,7 +3197,7 @@ static void gl_main_shutdown(void) r_texture_numcubemaps = 0; //r_texture_fogintensity = NULL; memset(&r_fb, 0, sizeof(r_fb)); - R_GLSL_Restart_f(cmd_client); + R_GLSL_Restart_f(cmd_local); r_glsl_permutation = NULL; memset(r_glsl_permutationhash, 0, sizeof(r_glsl_permutationhash)); @@ -5632,7 +5632,7 @@ void R_RenderView(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture, i rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity if(R_CompileShader_CheckStaticParms()) - R_GLSL_Restart_f(cmd_client); + R_GLSL_Restart_f(cmd_local); if (!r_drawentities.integer) r_refdef.scene.numentities = 0; diff --git a/host.c b/host.c index 5c50ba79..1bba0f9e 100644 --- a/host.c +++ b/host.c @@ -293,10 +293,10 @@ void Host_LoadConfig_f(cmd_state_t *cmd) Cmd_RestoreInitState(); #ifdef CONFIG_MENU // prepend a menu restart command to execute after the config - Cbuf_InsertText(cmd_client, "\nmenu_restart\n"); + Cbuf_InsertText(cmd_local, "\nmenu_restart\n"); #endif // reset cvars to their defaults, and then exec startup scripts again - Host_AddConfigText(cmd_client); + Host_AddConfigText(cmd_local); } //============================================================================ @@ -640,13 +640,13 @@ static void Host_Init (void) // here comes the not so critical stuff - Host_AddConfigText(cmd_client); + Host_AddConfigText(cmd_local); // if quake.rc is missing, use default if (!FS_FileExists("quake.rc")) { - Cbuf_AddText(cmd_client, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n"); - Cbuf_Execute(cmd_client->cbuf); + Cbuf_AddText(cmd_local, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n"); + Cbuf_Execute(cmd_local->cbuf); } host.state = host_active; @@ -667,8 +667,8 @@ static void Host_Init (void) if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1])); - Cbuf_Execute(cmd_client->cbuf); + Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1])); + Cbuf_Execute(cmd_local->cbuf); } // check for special demo mode @@ -677,8 +677,8 @@ static void Host_Init (void) if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1])); - Cbuf_Execute(cmd_client->cbuf); + Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1])); + Cbuf_Execute(cmd_local->cbuf); } #ifdef CONFIG_VIDEO_CAPTURE @@ -687,24 +687,24 @@ static void Host_Init (void) if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1])); - Cbuf_Execute((cmd_client)->cbuf); + Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1])); + Cbuf_Execute((cmd_local)->cbuf); } #endif if (cls.state == ca_dedicated || Sys_CheckParm("-listen")) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(cmd_client, "startmap_dm\n"); - Cbuf_Execute(cmd_client->cbuf); + Cbuf_AddText(cmd_local, "startmap_dm\n"); + Cbuf_Execute(cmd_local->cbuf); } if (!sv.active && !cls.demoplayback && !cls.connect_trying) { #ifdef CONFIG_MENU - Cbuf_AddText(cmd_client, "togglemenu 1\n"); + Cbuf_AddText(cmd_local, "togglemenu 1\n"); #endif - Cbuf_Execute(cmd_client->cbuf); + Cbuf_Execute(cmd_local->cbuf); } Con_DPrint("========Initialized=========\n"); diff --git a/keys.c b/keys.c index b41f46b3..cef9dc91 100644 --- a/keys.c +++ b/keys.c @@ -1832,7 +1832,7 @@ void Key_EventQueue_Unblock(void) void Key_Event (int key, int ascii, qbool down) { - cmd_state_t *cmd = cmd_client; + cmd_state_t *cmd = cmd_local; const char *bind; qbool q; keydest_t keydest = key_dest; @@ -1910,7 +1910,7 @@ Key_Event (int key, int ascii, qbool down) { if(down) { - Con_ToggleConsole_f(cmd_client); + Con_ToggleConsole_f(cmd_local); tbl_keydest[key] = key_void; // esc release should go nowhere (especially not to key_menu or key_game) } return; @@ -1929,7 +1929,7 @@ Key_Event (int key, int ascii, qbool down) #endif } else - Con_ToggleConsole_f(cmd_client); + Con_ToggleConsole_f(cmd_local); } break; @@ -1993,7 +1993,7 @@ Key_Event (int key, int ascii, qbool down) // (special exemption for german keyboard layouts) if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1)) { - Con_ToggleConsole_f(cmd_client); + Con_ToggleConsole_f(cmd_local); return; } diff --git a/libcurl.c b/libcurl.c index 24b20fba..c29a1894 100644 --- a/libcurl.c +++ b/libcurl.c @@ -331,16 +331,16 @@ static void Curl_CheckCommandWhenDone(void) if(numdownloads_fail == 0) { Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done); - Cbuf_AddText(cmd_client, "\n"); - Cbuf_AddText(cmd_client, command_when_done); - Cbuf_AddText(cmd_client, "\n"); + Cbuf_AddText(cmd_local, "\n"); + Cbuf_AddText(cmd_local, command_when_done); + Cbuf_AddText(cmd_local, "\n"); } else { Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error); - Cbuf_AddText(cmd_client, "\n"); - Cbuf_AddText(cmd_client, command_when_error); - Cbuf_AddText(cmd_client, "\n"); + Cbuf_AddText(cmd_local, "\n"); + Cbuf_AddText(cmd_local, command_when_error); + Cbuf_AddText(cmd_local, "\n"); } Curl_Clear_forthismap(); } @@ -1553,7 +1553,7 @@ void Curl_Init_Commands(void) Cvar_RegisterVariable (&cl_curl_useragent); Cvar_RegisterVariable (&cl_curl_useragent_append); Cmd_AddCommand(CF_CLIENT | CF_CLIENT_FROM_SERVER, "curl", Curl_Curl_f, "download data from an URL and add to search path"); - //Cmd_AddCommand(cmd_client, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)"); + //Cmd_AddCommand(cmd_local, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)"); } /* diff --git a/menu.c b/menu.c index 4ef7d081..2dc43ec9 100644 --- a/menu.c +++ b/menu.c @@ -282,7 +282,7 @@ static void M_ToggleMenu(int mode) { if(mode == 0) return; // the menu is off, and we want it off - M_Menu_Main_f (cmd_client); + M_Menu_Main_f (cmd_local); } else { @@ -4910,7 +4910,7 @@ void M_Draw (void) void M_KeyEvent (int key, int ascii, qbool downevent) { - cmd_state_t *cmd = cmd_client; + cmd_state_t *cmd = cmd_local; if (!downevent) return; switch (m_state) @@ -5378,7 +5378,7 @@ static void MP_Shutdown (void) static void MP_Init (void) { prvm_prog_t *prog = MVM_prog; - PRVM_Prog_Init(prog, cmd_client); + PRVM_Prog_Init(prog, cmd_local); prog->edictprivate_size = 0; // no private struct used prog->name = "menu"; diff --git a/mvm_cmds.c b/mvm_cmds.c index 337d196b..69801a04 100644 --- a/mvm_cmds.c +++ b/mvm_cmds.c @@ -1058,7 +1058,7 @@ void VM_cin_restart(prvm_prog_t *prog) static void VM_M_registercommand(prvm_prog_t *prog) { VM_SAFEPARMCOUNT(1, VM_M_registercommand); - if(!Cmd_Exists(cmd_client, PRVM_G_STRING(OFS_PARM0))) + if(!Cmd_Exists(cmd_local, PRVM_G_STRING(OFS_PARM0))) Cmd_AddCommand(CF_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC"); } @@ -1076,7 +1076,7 @@ VM_vlen, // #9 VM_vectoyaw, // #10 VM_vectoangles, // #11 VM_random, // #12 -VM_localcmd_client, // #13 +VM_localcmd_local, // #13 VM_cvar, // #14 VM_cvar_set, // #15 VM_dprint, // #16 diff --git a/netconn.c b/netconn.c index 1d52b5ad..32fb1f35 100755 --- a/netconn.c +++ b/netconn.c @@ -2938,7 +2938,7 @@ static void RCon_Execute(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress, c if(l) { client_t *host_client_save = host_client; - Cmd_ExecuteString(cmd_server, s, src_local, true); + Cmd_ExecuteString(cmd_local, s, src_local, true); host_client = host_client_save; // in case it is a command that changes host_client (like restart) } diff --git a/progsvm.h b/progsvm.h index c2d70f14..ea08900d 100644 --- a/progsvm.h +++ b/progsvm.h @@ -631,7 +631,7 @@ typedef struct prvm_prog_s struct fssearch_s *opensearches[PRVM_MAX_OPENSEARCHES]; const char * opensearches_origin[PRVM_MAX_OPENSEARCHES]; struct skeleton_s *skeletons[MAX_EDICTS]; - struct cmd_state_s *console_cmd; // points to the relevant console command interpreter for this vm (cmd_client or &cmd_server), also used to access cvars + struct cmd_state_s *console_cmd; // points to the relevant console command interpreter for this vm (cmd_local or &cmd_server), also used to access cvars // buffer for storing all tempstrings created during one invocation of ExecuteProgram sizebuf_t tempstringsbuf; diff --git a/prvm_cmds.c b/prvm_cmds.c index 1711d33c..8658085e 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -623,7 +623,7 @@ void VM_break(prvm_prog_t *prog) /* ================= -VM_localcmd_client +VM_localcmd_local Sends text over to the client's execution buffer @@ -631,12 +631,12 @@ Sends text over to the client's execution buffer cmd (string, ...) ================= */ -void VM_localcmd_client(prvm_prog_t *prog) +void VM_localcmd_local(prvm_prog_t *prog) { char string[VM_STRINGTEMP_LENGTH]; - VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_client); + VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_local); VM_VarString(prog, 0, string, sizeof(string)); - Cbuf_AddText(cmd_client, string); + Cbuf_AddText(cmd_local, string); } /* @@ -654,7 +654,7 @@ void VM_localcmd_server(prvm_prog_t *prog) char string[VM_STRINGTEMP_LENGTH]; VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_server); VM_VarString(prog, 0, string, sizeof(string)); - Cbuf_AddText(cmd_server, string); + Cbuf_AddText(cmd_local, string); } static qbool PRVM_Cvar_ReadOk(prvm_prog_t *prog, const char *string) @@ -1363,12 +1363,11 @@ coredump() */ void VM_coredump(prvm_prog_t *prog) { - cmd_state_t *cmd = !host_isclient.integer ? cmd_server : cmd_client; VM_SAFEPARMCOUNT(0,VM_coredump); - Cbuf_AddText(cmd, "prvm_edicts "); - Cbuf_AddText(cmd, prog->name); - Cbuf_AddText(cmd, "\n"); + Cbuf_AddText(cmd_local, "prvm_edicts "); + Cbuf_AddText(cmd_local, prog->name); + Cbuf_AddText(cmd_local, "\n"); } /* @@ -1549,7 +1548,7 @@ void VM_changelevel(prvm_prog_t *prog) return; svs.changelevel_issued = true; - Cbuf_AddText(cmd_server, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0))); + Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0))); } /* @@ -1697,7 +1696,7 @@ void VM_registercvar(prvm_prog_t *prog) return; // check for overlap with a command - if (Cmd_Exists(cmd_client, name) || Cmd_Exists(cmd_server, name)) + if (Cmd_Exists(cmd_local, name) || Cmd_Exists(cmd_local, name)) { VM_Warning(prog, "VM_registercvar: %s is a command\n", name); return; diff --git a/prvm_cmds.h b/prvm_cmds.h index c3c83b2f..a5555cde 100644 --- a/prvm_cmds.h +++ b/prvm_cmds.h @@ -238,7 +238,7 @@ void VM_vectoangles (prvm_prog_t *prog); void VM_random (prvm_prog_t *prog); void VM_localsound(prvm_prog_t *prog); void VM_break (prvm_prog_t *prog); -void VM_localcmd_client(prvm_prog_t *prog); +void VM_localcmd_local(prvm_prog_t *prog); void VM_localcmd_server(prvm_prog_t *prog); void VM_cvar (prvm_prog_t *prog); void VM_cvar_string(prvm_prog_t *prog); diff --git a/r_shadow.c b/r_shadow.c index 3abad9d0..7c23361b 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -372,7 +372,7 @@ static void R_Shadow_SetShadowMode(void) } if(R_CompileShader_CheckStaticParms()) - R_GLSL_Restart_f(cmd_client); + R_GLSL_Restart_f(cmd_local); } qbool R_Shadow_ShadowMappingEnabled(void) @@ -597,7 +597,7 @@ static void r_shadow_newmap(void) if (r_editlights_sprcubemapnoshadowlight) { R_SkinFrame_MarkUsed(r_editlights_sprcubemapnoshadowlight); } if (r_editlights_sprselection) { R_SkinFrame_MarkUsed(r_editlights_sprselection); } if (strncmp(cl.worldname, r_shadow_mapname, sizeof(r_shadow_mapname))) - R_Shadow_EditLights_Reload_f(cmd_client); + R_Shadow_EditLights_Reload_f(cmd_local); } void R_Shadow_Init(void) @@ -5742,7 +5742,7 @@ static void R_Shadow_EditLights_EditAll_f(cmd_state_t *cmd) if (!light) continue; R_Shadow_SelectLight(light); - R_Shadow_EditLights_Edit_f(cmd_client); + R_Shadow_EditLights_Edit_f(cmd_local); } // return to old selected (to not mess editing once selection is locked) R_Shadow_SelectLight(oldselected); diff --git a/sv_ccmds.c b/sv_ccmds.c index 31359d0f..cbd91e62 100644 --- a/sv_ccmds.c +++ b/sv_ccmds.c @@ -1627,7 +1627,7 @@ void SV_InitOperatorCommands(void) Cmd_AddCommand(CF_SHARED, "maxplayers", SV_MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once"); host.hook.SV_SendCvar = SV_SendCvar_f; - // commands that do not have automatic forwarding from cmd_client, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar) + // commands that do not have automatic forwarding from cmd_local, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar) Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "prespawn", SV_PreSpawn_f, "internal use - signon 1 (client acknowledges that server information has been received)"); Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "spawn", SV_Spawn_f, "internal use - signon 2 (client has sent player information, and is asking server to send scoreboard rankings)"); Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "begin", SV_Begin_f, "internal use - signon 3 (client asks server to start sending entities, and will go to signon 4 (playing) when the first entity update is received)"); diff --git a/sv_main.c b/sv_main.c index 4730fa50..ea6cce39 100644 --- a/sv_main.c +++ b/sv_main.c @@ -2270,7 +2270,7 @@ static qbool SVVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent) static void SV_VM_Setup(void) { prvm_prog_t *prog = SVVM_prog; - PRVM_Prog_Init(prog, cmd_server); + PRVM_Prog_Init(prog, cmd_local); // allocate the mempools // TODO: move the magic numbers/constants into #defines [9/13/2006 Black] diff --git a/svvm_cmds.c b/svvm_cmds.c index 8de1d444..e17c24ea 100644 --- a/svvm_cmds.c +++ b/svvm_cmds.c @@ -2860,7 +2860,7 @@ qbool SV_VM_ConsoleCommand (const char *text) static void VM_SV_registercommand (prvm_prog_t *prog) { VM_SAFEPARMCOUNT(1, VM_SV_registercmd); - if(!Cmd_Exists(cmd_server, PRVM_G_STRING(OFS_PARM0))) + if(!Cmd_Exists(cmd_local, PRVM_G_STRING(OFS_PARM0))) Cmd_AddCommand(CF_SERVER, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC"); } diff --git a/sys_shared.c b/sys_shared.c index e9b76f4b..3c6b0356 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -48,10 +48,8 @@ char *Sys_TimeString(const char *timeformat) void Sys_Quit (int returnvalue) { // Unlock mutexes because the quit command may jump directly here, causing a deadlock - if ((cmd_client)->cbuf->lock) - Cbuf_Unlock((cmd_client)->cbuf); - if ((cmd_server)->cbuf->lock) - Cbuf_Unlock((cmd_server)->cbuf); + if ((cmd_local)->cbuf->lock) + Cbuf_Unlock((cmd_local)->cbuf); SV_UnlockThreadMutex(); TaskQueue_Frame(true); diff --git a/vid_sdl.c b/vid_sdl.c index 23e9fe9c..2fb307c5 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -894,7 +894,7 @@ static void IN_Move_TouchScreen_Quake(void) if (!VID_ShowingKeyboard()) { // user entered a command, close the console now - Con_ToggleConsole_f(cmd_client); + Con_ToggleConsole_f(cmd_local); } VID_TouchscreenArea( 0, 0, 0, 0, 0, NULL , 0.0f, NULL, NULL, &buttons[15], (keynum_t)0, NULL, 0, 0, 0, true); VID_TouchscreenArea( 0, 0, 0, 0, 0, NULL , 0.0f, NULL, move, &buttons[0], K_MOUSE4, NULL, 0, 0, 0, true); @@ -1179,7 +1179,7 @@ void Sys_SendKeyEvents( void ) // so, let's better queue it for next frame if(!sdl_needs_restart) { - Cbuf_AddText(cmd_client, "\nr_restart\n"); + Cbuf_AddText(cmd_local, "\nr_restart\n"); sdl_needs_restart = true; } #endif -- 2.39.2