#include "thread.h"
cmd_state_t cmd_client;
-cmd_state_t cmd_clientfromserver;
cmd_state_t cmd_server;
cmd_state_t cmd_serverfromclient;
static cmd_iter_t cmd_iter_all[] = {
{&cmd_client},
- {&cmd_clientfromserver},
{&cmd_server},
{&cmd_serverfromclient},
{NULL},
void Cbuf_Lock(cmd_state_t *cmd)
{
- Thread_AtomicLock(&cmd->text_lock);
+ Thread_LockMutex(cmd->text_mutex);
}
void Cbuf_Unlock(cmd_state_t *cmd)
{
- Thread_AtomicUnlock(&cmd->text_lock);
+ Thread_UnlockMutex(cmd->text_mutex);
}
l = (int)strlen(text);
Cbuf_Lock(cmd);
- if (cmd->text.cursize + l >= (size_t)cmd->text.maxsize)
+ if (cmd->text.maxsize - cmd->text.cursize <= l)
Con_Print("Cbuf_AddText: overflow\n");
else
SZ_Write(&cmd->text, (const unsigned char *)text, l);
*/
static void Cbuf_Execute_Deferred (cmd_state_t *cmd)
{
- static double oldrealtime = 0;
cmddeferred_t *defcmd, *prev;
double eat;
- if (realtime - oldrealtime < 0 || realtime - oldrealtime > 1800) oldrealtime = realtime;
- eat = realtime - oldrealtime;
+ if (host.realtime - cmd->deferred_oldrealtime < 0 || host.realtime - cmd->deferred_oldrealtime > 1800) cmd->deferred_oldrealtime = host.realtime;
+ eat = host.realtime - cmd->deferred_oldrealtime;
if (eat < (1.0 / 120.0))
return;
- oldrealtime = realtime;
+ cmd->deferred_oldrealtime = host.realtime;
prev = NULL;
defcmd = cmd->deferred_list;
while(defcmd)
// better than CRASHING on overlong input lines that may SOMEHOW enter the buffer
if(i >= MAX_INPUTLINE)
{
- Con_Printf("Warning: console input buffer had an overlong line. Ignored.\n");
+ Con_Printf(CON_WARN "Warning: console input buffer had an overlong line. Ignored.\n");
line[0] = 0;
}
else
int i, j, l;
// this is for all commandline options combined (and is bounds checked)
char build[MAX_INPUTLINE];
+
+ // come back later so we don't crash
+ if(host.state == host_init)
+ return;
if (Cmd_Argc (cmd) != 1)
{
host_stuffcmdsrun = true;
build[0] = 0;
l = 0;
- for (i = 0;i < com_argc;i++)
+ for (i = 0;i < sys.argc;i++)
{
- if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9') && l + strlen(com_argv[i]) - 1 <= sizeof(build) - 1)
+ if (sys.argv[i] && sys.argv[i][0] == '+' && (sys.argv[i][1] < '0' || sys.argv[i][1] > '9') && l + strlen(sys.argv[i]) - 1 <= sizeof(build) - 1)
{
j = 1;
- while (com_argv[i][j])
- build[l++] = com_argv[i][j++];
+ while (sys.argv[i][j])
+ build[l++] = sys.argv[i][j++];
i++;
- for (;i < com_argc;i++)
+ for (;i < sys.argc;i++)
{
- if (!com_argv[i])
+ if (!sys.argv[i])
continue;
- if ((com_argv[i][0] == '+' || com_argv[i][0] == '-') && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
+ if ((sys.argv[i][0] == '+' || sys.argv[i][0] == '-') && (sys.argv[i][1] < '0' || sys.argv[i][1] > '9'))
break;
- if (l + strlen(com_argv[i]) + 4 > sizeof(build) - 1)
+ if (l + strlen(sys.argv[i]) + 4 > sizeof(build) - 1)
break;
build[l++] = ' ';
- if (strchr(com_argv[i], ' '))
+ if (strchr(sys.argv[i], ' '))
build[l++] = '\"';
- for (j = 0;com_argv[i][j];j++)
- build[l++] = com_argv[i][j];
- if (strchr(com_argv[i], ' '))
+ for (j = 0;sys.argv[i][j];j++)
+ build[l++] = sys.argv[i][j];
+ if (strchr(sys.argv[i], ' '))
build[l++] = '\"';
}
build[l++] = '\n';
"sys_ticrate 0.01388889\n"
"r_shadow_gloss 1\n"
"r_shadow_bumpscale_basetexture 0\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
case GAME_NEHAHRA:
"sys_ticrate 0.01388889\n"
"r_shadow_gloss 1\n"
"r_shadow_bumpscale_basetexture 0\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
// hipnotic mission pack has issues in their 'friendly monster' ai, which seem to attempt to attack themselves for some reason when findradius() returns non-solid entities.
"sys_ticrate 0.02\n"
"r_shadow_gloss 1\n"
"r_shadow_bumpscale_basetexture 0\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
// rogue mission pack has a guardian boss that does not wake up if findradius returns one of the entities around its spawn area
"sys_ticrate 0.01388889\n"
"r_shadow_gloss 1\n"
"r_shadow_bumpscale_basetexture 0\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
case GAME_TENEBRAE:
"sys_ticrate 0.01388889\n"
"r_shadow_gloss 2\n"
"r_shadow_bumpscale_basetexture 4\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
case GAME_NEXUIZ:
"sys_ticrate 0.01388889\n"
"sv_gameplayfix_q2airaccelerate 1\n"
"sv_gameplayfix_stepmultipletimes 1\n"
+"csqc_polygons_defaultmaterial_nocullface 1\n"
+"con_chatsound_team_mask 13\n"
+ );
+ break;
+ case GAME_XONOTIC:
+ case GAME_VORETOURNAMENT:
+ // compatibility for versions prior to 2020-05-25, this can be overridden in newer versions to get the default behavior and be consistent with FTEQW engine
+ Cbuf_InsertText(cmd, "\n"
+"csqc_polygons_defaultmaterial_nocullface 1\n"
+"con_chatsound_team_mask 13\n"
+"sv_gameplayfix_customstats 1\n"
);
break;
// Steel Storm: Burning Retribution csqc misinterprets CSQC_InputEvent if type is a value other than 0 or 1
"sv_gameplayfix_downtracesupportsongroundflag 1\n"
"sys_ticrate 0.01388889\n"
"cl_csqc_generatemousemoveevents 0\n"
+"csqc_polygons_defaultmaterial_nocullface 1\n"
);
break;
default:
"sv_gameplayfix_swiminbmodels 1\n"
"sv_gameplayfix_downtracesupportsongroundflag 1\n"
"sys_ticrate 0.01388889\n"
+"csqc_polygons_defaultmaterial_nocullface 0\n"
);
break;
}
return;
}
- s = FS_Search(Cmd_Argv(cmd, 1), true, true);
+ s = FS_Search(Cmd_Argv(cmd, 1), true, true, NULL);
if(!s || !s->numfilenames)
{
Con_Printf("couldn't exec %s\n",Cmd_Argv(cmd, 1));
{
// empty cvar name?
if(alias)
- Con_Printf("Warning: Could not expand $ in alias %s\n", alias->name);
+ Con_Printf(CON_WARN "Warning: Could not expand $ in alias %s\n", alias->name);
else
- Con_Printf("Warning: Could not expand $\n");
+ Con_Printf(CON_WARN "Warning: Could not expand $\n");
return "$";
}
if(required)
{
if(alias)
- Con_Printf("Error: Could not expand $%s in alias %s\n", varname, alias->name);
+ Con_Printf(CON_ERROR "Error: Could not expand $%s in alias %s\n", varname, alias->name);
else
- Con_Printf("Error: Could not expand $%s\n", varname);
+ Con_Printf(CON_ERROR "Error: Could not expand $%s\n", varname);
return NULL;
}
else if(optional)
else
{
if(alias)
- Con_Printf("Warning: Could not expand $%s in alias %s\n", varname, alias->name);
+ Con_Printf(CON_WARN "Warning: Could not expand $%s in alias %s\n", varname, alias->name);
else
- Con_Printf("Warning: Could not expand $%s\n", varname);
+ Con_Printf(CON_WARN "Warning: Could not expand $%s\n", varname);
dpsnprintf(varval, sizeof(varval), "$%s", varname);
return varval;
}
partial = Cmd_Args(cmd);
else
{
- Con_Printf("usage: apropos <string>\n");
+ Con_Printf("usage: %s <string>\n",Cmd_Argv(cmd, 0));
return;
}
count = 0;
for (cvar = cmd->cvars->vars; cvar; cvar = cvar->next)
{
- if (!matchpattern_with_separator(cvar->name, partial, true, "", false))
- if (!matchpattern_with_separator(cvar->description, partial, true, "", false))
- continue;
- Con_Printf ("cvar ^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
- count++;
+ if (matchpattern_with_separator(cvar->name, partial, true, "", false) ||
+ matchpattern_with_separator(cvar->description, partial, true, "", false))
+ {
+ Con_Printf ("cvar ");
+ Cvar_PrintHelp(cvar, cvar->name, true);
+ count++;
+ }
+ for (int i = 0; i < cvar->aliasindex; i++)
+ {
+ if (matchpattern_with_separator(cvar->aliases[i], partial, true, "", false))
+ {
+ Con_Printf ("cvar ");
+ Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+ count++;
+ }
+ }
}
for (func = cmd->userdefined->csqc_functions; func; func = func->next)
{
// client console can see server cvars because the user may start a server
cmd_client.cvars = &cvars_all;
cmd_client.cvars_flagsmask = CVAR_CLIENT | CVAR_SERVER;
+ cmd_client.cmd_flags = CMD_CLIENT | CMD_CLIENT_FROM_SERVER | CMD_SERVER_FROM_CLIENT;
cmd_client.userdefined = &cmd_userdefined_all;
- // stuffcmd from server has access to the reasonable client things, but it probably doesn't need to access the client's server-only cvars
- cmd_clientfromserver.cvars = &cvars_all;
- cmd_clientfromserver.cvars_flagsmask = CVAR_CLIENT;
- cmd_clientfromserver.userdefined = &cmd_userdefined_all;
+ cmd_client.text_mutex = Thread_CreateMutex();
// dedicated server console can only see server cvars, there is no client
cmd_server.cvars = &cvars_all;
cmd_server.cvars_flagsmask = CVAR_SERVER;
+ cmd_server.cmd_flags = CMD_SERVER;
cmd_server.userdefined = &cmd_userdefined_all;
+ cmd_server.text_mutex = Thread_CreateMutex();
// server commands received from clients have no reason to access cvars, cvar expansion seems perilous.
cmd_serverfromclient.cvars = &cvars_null;
cmd_serverfromclient.cvars_flagsmask = 0;
+ cmd_serverfromclient.cmd_flags = CMD_SERVER_FROM_CLIENT | CMD_USERINFO;
cmd_serverfromclient.userdefined = &cmd_userdefined_null;
-}
+ cmd_serverfromclient.text_mutex = Thread_CreateMutex();
-void Cmd_Init_Commands(qboolean dedicated_server)
-{
//
// register our commands
//
// client-only commands
- Cmd_AddCommand(&cmd_client, "cmd", Cmd_ForwardToServer_f, "send a console commandline to the server (used by some mods)");
- Cmd_AddCommand(&cmd_clientfromserver, "cmd", Cmd_ForwardToServer_f, "send a console commandline to the server (used by some mods)");
- Cmd_AddCommand(&cmd_client, "wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
- Cmd_AddCommand(&cmd_client, "cprint", Cmd_Centerprint_f, "print something at the screen center");
+ Cmd_AddCommand(CMD_SHARED, "wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
+ Cmd_AddCommand(CMD_CLIENT, "cprint", Cmd_Centerprint_f, "print something at the screen center");
// maintenance commands used for upkeep of cvars and saved configs
- Cmd_AddCommand(&cmd_client, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
- Cmd_AddCommand(&cmd_client, "cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg");
- Cmd_AddCommand(&cmd_client, "cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values");
- Cmd_AddCommand(&cmd_client, "cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)");
- Cmd_AddCommand(&cmd_client, "cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)");
- Cmd_AddCommand(&cmd_server, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
- Cmd_AddCommand(&cmd_server, "cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg");
- Cmd_AddCommand(&cmd_server, "cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values");
- Cmd_AddCommand(&cmd_server, "cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)");
- Cmd_AddCommand(&cmd_server, "cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)");
+ Cmd_AddCommand(CMD_SHARED, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
+ Cmd_AddCommand(CMD_SHARED, "cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg");
+ Cmd_AddCommand(CMD_SHARED, "cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values");
+ Cmd_AddCommand(CMD_SHARED, "cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)");
+ Cmd_AddCommand(CMD_SHARED, "cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)");
// general console commands used in multiple environments
- Cmd_AddCommand(&cmd_client, "exec", Cmd_Exec_f, "execute a script file");
- Cmd_AddCommand(&cmd_client, "echo",Cmd_Echo_f, "print a message to the console (useful in scripts)");
- Cmd_AddCommand(&cmd_client, "alias",Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias");
- Cmd_AddCommand(&cmd_client, "unalias",Cmd_UnAlias_f, "remove an alias");
- Cmd_AddCommand(&cmd_client, "set", Cvar_Set_f, "create or change the value of a console variable");
- Cmd_AddCommand(&cmd_client, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
- Cmd_AddCommand(&cmd_client, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
- Cmd_AddCommand(&cmd_clientfromserver, "exec", Cmd_Exec_f, "execute a script file");
- Cmd_AddCommand(&cmd_clientfromserver, "echo", Cmd_Echo_f, "print a message to the console (useful in scripts)");
- Cmd_AddCommand(&cmd_clientfromserver, "alias", Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias");
- Cmd_AddCommand(&cmd_clientfromserver, "unalias", Cmd_UnAlias_f, "remove an alias");
- Cmd_AddCommand(&cmd_clientfromserver, "set", Cvar_Set_f, "create or change the value of a console variable");
- Cmd_AddCommand(&cmd_clientfromserver, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
- Cmd_AddCommand(&cmd_clientfromserver, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
- Cmd_AddCommand(&cmd_server, "exec", Cmd_Exec_f, "execute a script file");
- Cmd_AddCommand(&cmd_server, "echo", Cmd_Echo_f, "print a message to the console (useful in scripts)");
- Cmd_AddCommand(&cmd_server, "alias", Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias");
- Cmd_AddCommand(&cmd_server, "unalias", Cmd_UnAlias_f, "remove an alias");
- Cmd_AddCommand(&cmd_server, "set", Cvar_Set_f, "create or change the value of a console variable");
- Cmd_AddCommand(&cmd_server, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
- Cmd_AddCommand(&cmd_server, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
+ Cmd_AddCommand(CMD_SHARED, "exec", Cmd_Exec_f, "execute a script file");
+ Cmd_AddCommand(CMD_SHARED, "echo",Cmd_Echo_f, "print a message to the console (useful in scripts)");
+ Cmd_AddCommand(CMD_SHARED, "alias",Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias");
+ Cmd_AddCommand(CMD_SHARED, "unalias",Cmd_UnAlias_f, "remove an alias");
+ Cmd_AddCommand(CMD_SHARED, "set", Cvar_Set_f, "create or change the value of a console variable");
+ Cmd_AddCommand(CMD_SHARED, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+ Cmd_AddCommand(CMD_SHARED, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
#ifdef FILLALLCVARSWITHRUBBISH
- Cmd_AddCommand(&cmd_client, "fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
- Cmd_AddCommand(&cmd_server, "fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
+ Cmd_AddCommand(CMD_SHARED, "fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
#endif /* FILLALLCVARSWITHRUBBISH */
// 2000-01-09 CmdList, CvarList commands By Matthias "Maddes" Buecher
// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
- Cmd_AddCommand(&cmd_client, "cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern");
- Cmd_AddCommand(&cmd_client, "cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern");
- Cmd_AddCommand(&cmd_client, "apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
- Cmd_AddCommand(&cmd_server, "cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern");
- Cmd_AddCommand(&cmd_server, "cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern");
- Cmd_AddCommand(&cmd_server, "apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
+ Cmd_AddCommand(CMD_SHARED, "cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern");
+ Cmd_AddCommand(CMD_SHARED, "cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern");
+ Cmd_AddCommand(CMD_SHARED, "apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
+ Cmd_AddCommand(CMD_SHARED, "find", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
- Cmd_AddCommand(&cmd_client, "defer", Cmd_Defer_f, "execute a command in the future");
- Cmd_AddCommand(&cmd_server, "defer", Cmd_Defer_f, "execute a command in the future");
+ Cmd_AddCommand(CMD_SHARED, "defer", Cmd_Defer_f, "execute a command in the future");
// DRESK - 5/14/06
// Support Doom3-style Toggle Command
- Cmd_AddCommand(&cmd_client, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)");
- Cmd_AddCommand(&cmd_server, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)");
- Cmd_AddCommand(&cmd_clientfromserver, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)");
+ Cmd_AddCommand(CMD_SHARED | CMD_CLIENT_FROM_SERVER, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)");
}
/*
{
cmd_state_t *cmd = cmd_iter->cmd;
- if (cmd->text_lock)
+ if (cmd->text_mutex)
{
// we usually have this locked when we get here from Host_Quit_f
Cbuf_Unlock(cmd);
l = (int)strlen(com_token) + 1;
if (cmd->tokenizebufferpos + l > CMD_TOKENIZELENGTH)
{
- Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
+ Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
break;
}
memcpy (cmd->tokenizebuffer + cmd->tokenizebufferpos, com_token, l);
Cmd_AddCommand
============
*/
-void Cmd_AddCommand(cmd_state_t *cmd, const char *cmd_name, xcommand_t function, const char *description)
+void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const char *description)
{
cmd_function_t *func;
cmd_function_t *prev, *current;
+ cmd_state_t *cmd;
+ xcommand_t save = NULL;
+ int i;
-// fail if the command is a variable name
- if (Cvar_FindVar(cmd->cvars, cmd_name, ~0))
- {
- Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
- return;
- }
-
- if (function)
+ for (i = 0; i < 3; i++)
{
- // fail if the command already exists in this interpreter
- for (func = cmd->engine_functions; func; func = func->next)
+ cmd = cmd_iter_all[i].cmd;
+ if (flags & cmd->cmd_flags)
{
- if (!strcmp(cmd_name, func->name))
+ if(cmd == &cmd_client && (flags & CMD_SERVER_FROM_CLIENT) && !(flags & CMD_CLIENT))
+ {
+ save = function;
+ function = CL_ForwardToServer_f;
+ }
+ // fail if the command is a variable name
+ if (Cvar_FindVar(cmd->cvars, cmd_name, ~0))
{
- Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
+ Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
return;
}
- }
- func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
- func->name = cmd_name;
- func->function = function;
- func->description = description;
- func->next = cmd->engine_functions;
-
- // insert it at the right alphanumeric position
- for (prev = NULL, current = cmd->engine_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
- ;
- if (prev) {
- prev->next = func;
- }
- else {
- cmd->engine_functions = func;
- }
- func->next = current;
- }
- else
- {
- // mark csqcfunc if the function already exists in the csqc_functions list
- for (func = cmd->userdefined->csqc_functions; func; func = func->next)
- {
- if (!strcmp(cmd_name, func->name))
+ if (function)
{
- func->csqcfunc = true; //[515]: csqc
- return;
+ // fail if the command already exists in this interpreter
+ for (func = cmd->engine_functions; func; func = func->next)
+ {
+ if (!strcmp(cmd_name, func->name))
+ {
+ Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
+ goto next;
+ }
+ }
+
+ func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
+ func->flags = flags;
+ func->name = cmd_name;
+ func->function = function;
+ func->description = description;
+ func->next = cmd->engine_functions;
+
+ // insert it at the right alphanumeric position
+ for (prev = NULL, current = cmd->engine_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
+ ;
+ if (prev) {
+ prev->next = func;
+ }
+ else {
+ cmd->engine_functions = func;
+ }
+ func->next = current;
}
- }
+ else
+ {
+ // mark csqcfunc if the function already exists in the csqc_functions list
+ for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+ {
+ if (!strcmp(cmd_name, func->name))
+ {
+ func->csqcfunc = true; //[515]: csqc
+ continue;
+ }
+ }
- func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
- func->name = cmd_name;
- func->function = function;
- func->description = description;
- func->csqcfunc = true; //[515]: csqc
- func->next = cmd->userdefined->csqc_functions;
+ func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
+ func->name = cmd_name;
+ func->function = function;
+ func->description = description;
+ func->csqcfunc = true; //[515]: csqc
+ func->next = cmd->userdefined->csqc_functions;
- // insert it at the right alphanumeric position
- for (prev = NULL, current = cmd->userdefined->csqc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
- ;
- if (prev) {
- prev->next = func;
- }
- else {
- cmd->userdefined->csqc_functions = func;
+ // insert it at the right alphanumeric position
+ for (prev = NULL, current = cmd->userdefined->csqc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
+ ;
+ if (prev) {
+ prev->next = func;
+ }
+ else {
+ cmd->userdefined->csqc_functions = func;
+ }
+ func->next = current;
+ }
+ if (save)
+ function = save;
}
- func->next = current;
+next:
+ continue;
}
}
return buf;
}
-void Cmd_ClearCsqcFuncs (cmd_state_t *cmd)
+// TODO: Make this more generic?
+void Cmd_ClearCSQCCommands (cmd_state_t *cmd)
{
cmd_function_t *func;
- for (func = cmd->userdefined->csqc_functions; func; func = func->next)
- func->csqcfunc = false;
+ cmd_function_t **next = &cmd->userdefined->csqc_functions;
+
+ while(*next)
+ {
+ func = *next;
+ *next = func->next;
+ Z_Free(func);
+ }
}
+extern cvar_t sv_cheats;
+
/*
============
Cmd_ExecuteString
case src_client:
if (func->function)
{
- func->function(cmd);
+ if((func->flags & CMD_CHEAT) && !sv_cheats.integer)
+ SV_ClientPrintf("No cheats allowed. The server must have sv_cheats set to 1\n");
+ else
+ func->function(cmd);
goto done;
}
}
// if it's a client command and no command was found, say so.
if (cmd->source == src_client)
{
- Con_Printf("player \"%s\" tried to %s\n", host_client->name, text);
+ Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text);
goto done;
}
}
// check cvars
- if (!Cvar_Command(cmd) && host_framecount > 0)
+ if (!Cvar_Command(cmd) && host.framecount > 0)
Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
-
done:
cmd->tokenizebufferpos = oldpos;
if (lockmutex)
Cbuf_Unlock(cmd);
}
-
-/*
-===================
-Cmd_ForwardStringToServer
-
-Sends an entire command string over to the server, unprocessed
-===================
-*/
-void Cmd_ForwardStringToServer (const char *s)
-{
- char temp[128];
- if (cls.state != ca_connected)
- {
- Con_Printf("Can't \"%s\", not connected\n", s);
- return;
- }
-
- if (!cls.netcon)
- return;
-
- // LadyHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
- // attention, it has been eradicated from here, its only (former) use in
- // all of darkplaces.
- if (cls.protocol == PROTOCOL_QUAKEWORLD)
- MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
- else
- MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
- if ((!strncmp(s, "say ", 4) || !strncmp(s, "say_team ", 9)) && cl_locs_enable.integer)
- {
- // say/say_team commands can replace % character codes with status info
- while (*s)
- {
- if (*s == '%' && s[1])
- {
- // handle proquake message macros
- temp[0] = 0;
- switch (s[1])
- {
- case 'l': // current location
- CL_Locs_FindLocationName(temp, sizeof(temp), cl.movement_origin);
- break;
- case 'h': // current health
- dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_HEALTH]);
- break;
- case 'a': // current armor
- dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_ARMOR]);
- break;
- case 'x': // current rockets
- dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_ROCKETS]);
- break;
- case 'c': // current cells
- dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_CELLS]);
- break;
- // silly proquake macros
- case 'd': // loc at last death
- CL_Locs_FindLocationName(temp, sizeof(temp), cl.lastdeathorigin);
- break;
- case 't': // current time
- dpsnprintf(temp, sizeof(temp), "%.0f:%.0f", floor(cl.time / 60), cl.time - floor(cl.time / 60) * 60);
- break;
- case 'r': // rocket launcher status ("I have RL", "I need rockets", "I need RL")
- if (!(cl.stats[STAT_ITEMS] & IT_ROCKET_LAUNCHER))
- dpsnprintf(temp, sizeof(temp), "I need RL");
- else if (!cl.stats[STAT_ROCKETS])
- dpsnprintf(temp, sizeof(temp), "I need rockets");
- else
- dpsnprintf(temp, sizeof(temp), "I have RL");
- break;
- case 'p': // powerup status (outputs "quad" "pent" and "eyes" according to status)
- if (cl.stats[STAT_ITEMS] & IT_QUAD)
- {
- if (temp[0])
- strlcat(temp, " ", sizeof(temp));
- strlcat(temp, "quad", sizeof(temp));
- }
- if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY)
- {
- if (temp[0])
- strlcat(temp, " ", sizeof(temp));
- strlcat(temp, "pent", sizeof(temp));
- }
- if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY)
- {
- if (temp[0])
- strlcat(temp, " ", sizeof(temp));
- strlcat(temp, "eyes", sizeof(temp));
- }
- break;
- case 'w': // weapon status (outputs "SSG:NG:SNG:GL:RL:LG" with the text between : characters omitted if you lack the weapon)
- if (cl.stats[STAT_ITEMS] & IT_SUPER_SHOTGUN)
- strlcat(temp, "SSG", sizeof(temp));
- strlcat(temp, ":", sizeof(temp));
- if (cl.stats[STAT_ITEMS] & IT_NAILGUN)
- strlcat(temp, "NG", sizeof(temp));
- strlcat(temp, ":", sizeof(temp));
- if (cl.stats[STAT_ITEMS] & IT_SUPER_NAILGUN)
- strlcat(temp, "SNG", sizeof(temp));
- strlcat(temp, ":", sizeof(temp));
- if (cl.stats[STAT_ITEMS] & IT_GRENADE_LAUNCHER)
- strlcat(temp, "GL", sizeof(temp));
- strlcat(temp, ":", sizeof(temp));
- if (cl.stats[STAT_ITEMS] & IT_ROCKET_LAUNCHER)
- strlcat(temp, "RL", sizeof(temp));
- strlcat(temp, ":", sizeof(temp));
- if (cl.stats[STAT_ITEMS] & IT_LIGHTNING)
- strlcat(temp, "LG", sizeof(temp));
- break;
- default:
- // not a recognized macro, print it as-is...
- temp[0] = s[0];
- temp[1] = s[1];
- temp[2] = 0;
- break;
- }
- // write the resulting text
- SZ_Write(&cls.netcon->message, (unsigned char *)temp, (int)strlen(temp));
- s += 2;
- continue;
- }
- MSG_WriteByte(&cls.netcon->message, *s);
- s++;
- }
- MSG_WriteByte(&cls.netcon->message, 0);
- }
- else // any other command is passed on as-is
- SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1);
-}
-
-/*
-===================
-Cmd_ForwardToServer
-
-Sends the entire command line over to the server
-===================
-*/
-void Cmd_ForwardToServer_f (cmd_state_t *cmd)
-{
- const char *s;
- char vabuf[1024];
- if (!strcasecmp(Cmd_Argv(cmd, 0), "cmd"))
- {
- // we want to strip off "cmd", so just send the args
- s = Cmd_Argc(cmd) > 1 ? Cmd_Args(cmd) : "";
- }
- else
- {
- // we need to keep the command name, so send Cmd_Argv(cmd, 0), a space and then Cmd_Args(cmd)
- s = va(vabuf, sizeof(vabuf), "%s %s", Cmd_Argv(cmd, 0), Cmd_Argc(cmd) > 1 ? Cmd_Args(cmd) : "");
- }
- // don't send an empty forward message if the user tries "cmd" by itself
- if (!s || !*s)
- return;
- Cmd_ForwardStringToServer(s);
-}
-
-
/*
================
Cmd_CheckParm