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);
}
{
cmddeferred_t *defcmd, *prev;
double eat;
- if (realtime - cmd->deferred_oldrealtime < 0 || realtime - cmd->deferred_oldrealtime > 1800) cmd->deferred_oldrealtime = realtime;
- eat = realtime - cmd->deferred_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;
- cmd->deferred_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_Warnf("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
==============================================================================
*/
-extern qboolean host_init;
-
/*
===============
Cmd_StuffCmds_f
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_init)
+ 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';
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_Warnf("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_Warnf("Warning: Could not expand $\n");
+ Con_Printf(CON_WARN "Warning: Could not expand $\n");
return "$";
}
if(required)
{
if(alias)
- Con_Errorf("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_Errorf("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_Warnf("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_Warnf("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;
}
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;
+ 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_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_CLIENT_FROM_SERVER, "cmd", Cmd_ForwardToServer_f, "send a console commandline to the server (used by some mods)");
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");
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_SHARED, "defer", Cmd_Defer_f, "execute a command in the future");
{
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);
if(cmd == &cmd_client && (flags & CMD_SERVER_FROM_CLIENT) && !(flags & CMD_CLIENT))
{
save = function;
- function = Cmd_ForwardToServer_f;
+ function = CL_ForwardToServer_f;
}
// fail if the command is a variable name
if (Cvar_FindVar(cmd->cvars, cmd_name, ~0))
}
// 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;
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