extern dllhandle_t ode_dll;
#endif
-// LordHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
+// LadyHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
void VM_Warning(prvm_prog_t *prog, const char *fmt, ...)
{
va_list argptr;
// TODO DONE: move vm_files and vm_fssearchlist to prvm_prog_t struct
// TODO: move vm_files and vm_fssearchlist back [9/13/2006 Black]
-// TODO: (move vm_files and vm_fssearchlist to prvm_prog_t struct again) [2007-01-23 LordHavoc]
-// TODO: will this war ever end? [2007-01-23 LordHavoc]
+// TODO: (move vm_files and vm_fssearchlist to prvm_prog_t struct again) [2007-01-23 LadyHavoc]
+// TODO: will this war ever end? [2007-01-23 LadyHavoc]
void VM_CheckEmptyString(prvm_prog_t *prog, const char *s)
{
framegroupblend[0].lerp = 1 - framegroupblend[1].lerp - framegroupblend[2].lerp - framegroupblend[3].lerp;
}
-// LordHavoc: quite tempting to break apart this function to reuse the
+// LadyHavoc: quite tempting to break apart this function to reuse the
// duplicated code, but I suspect it is better for performance
// this way
void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroupblend_t *framegroupblend, const dp_model_t *model, double curtime)
/*
=================
-VM_localcmd
+VM_localcmd_client
Sends text over to the client's execution buffer
cmd (string, ...)
=================
*/
-void VM_localcmd(prvm_prog_t *prog)
+void VM_localcmd_client(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
VM_VarString(prog, 0, string, sizeof(string));
- Cbuf_AddText(string);
+ Cbuf_AddText(&cmd_client, string);
}
-static qboolean PRVM_Cvar_ReadOk(const char *string)
+/*
+=================
+VM_localcmd_server
+
+Sends text over to the server's execution buffer
+
+[localcmd (string, ...) or]
+cmd (string, ...)
+=================
+*/
+void VM_localcmd_server(prvm_prog_t *prog)
+{
+ char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
+ VM_VarString(prog, 0, string, sizeof(string));
+ Cbuf_AddText(&cmd_server, string);
+}
+
+static qboolean PRVM_Cvar_ReadOk(prvm_prog_t *prog, const char *string)
{
cvar_t *cvar;
- cvar = Cvar_FindVar(string);
+ cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0));
}
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
VM_VarString(prog, 0, string, sizeof(string));
VM_CheckEmptyString(prog, string);
- PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(string) ? Cvar_VariableValue(string) : 0;
+ PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(prog, string) ? Cvar_VariableValue(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask) : 0;
}
/*
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
VM_VarString(prog, 0, string, sizeof(string));
VM_CheckEmptyString(prog, string);
- cvar = Cvar_FindVar(string);
+ cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
if(!cvar)
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string);
VM_VarString(prog, 0, string, sizeof(string));
VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_Cvar_ReadOk(string) ? Cvar_VariableString(string) : "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_Cvar_ReadOk(prog, string) ? Cvar_VariableString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask) : "");
}
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_defstring);
VM_VarString(prog, 0, string, sizeof(string));
VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDefString(string));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDefString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
}
/*
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_description);
VM_VarString(prog, 0, string, sizeof(string));
VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDescription(string));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDescription(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
}
/*
=================
VM_VarString(prog, 1, string, sizeof(string));
name = PRVM_G_STRING(OFS_PARM0);
VM_CheckEmptyString(prog, name);
- Cvar_Set(name, string);
+ Cvar_Set(prog->console_cmd->cvars, name, string);
}
/*
f = PRVM_G_INT(OFS_PARM1);
s = PRVM_G_STRING(OFS_PARM2);
- // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // LadyHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
// expects it to find all the monsters, so we must be careful to support
// searching for ""
entity findentity(entity start, .entity field, entity match)
=========
*/
-// LordHavoc: added this for searching float, int, and entity reference fields
+// LadyHavoc: added this for searching float, int, and entity reference fields
void VM_findfloat(prvm_prog_t *prog)
{
int e;
f = PRVM_G_INT(OFS_PARM0);
s = PRVM_G_STRING(OFS_PARM1);
- // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // LadyHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
// expects it to find all the monsters, so we must be careful to support
// searching for ""
entity findchainentity(.string field, entity match)
=========
*/
-// LordHavoc: chained search for float, int, and entity reference fields
+// LadyHavoc: chained search for float, int, and entity reference fields
// entity(.string field, float match) findchainfloat = #403;
void VM_findchainfloat(prvm_prog_t *prog)
{
entity findflags(entity start, .float field, float match)
========================
*/
-// LordHavoc: search for flags in float fields
+// LadyHavoc: search for flags in float fields
void VM_findflags(prvm_prog_t *prog)
{
prvm_int_t e;
entity findchainflags(.float field, float match)
========================
*/
-// LordHavoc: chained search for flags in float fields
+// LadyHavoc: chained search for flags in float fields
void VM_findchainflags(prvm_prog_t *prog)
{
prvm_int_t i;
*/
void VM_coredump(prvm_prog_t *prog)
{
+ cmd_state_t *cmd = cls.state == ca_dedicated ? &cmd_server : &cmd_client;
VM_SAFEPARMCOUNT(0,VM_coredump);
- Cbuf_AddText("prvm_edicts ");
- Cbuf_AddText(prog->name);
- Cbuf_AddText("\n");
+ Cbuf_AddText(cmd, "prvm_edicts ");
+ Cbuf_AddText(cmd, prog->name);
+ Cbuf_AddText(cmd, "\n");
}
/*
return;
svs.changelevel_issued = true;
- Cbuf_AddText(va(vabuf, sizeof(vabuf), "changelevel %s\n",PRVM_G_STRING(OFS_PARM0)));
+ Cbuf_AddText(&cmd_server, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
}
/*
return;
// first check to see if it has already been defined
- if (Cvar_FindVar (name))
+ if (Cvar_FindVar (prog->console_cmd->cvars, name, prog->console_cmd->cvars_flagsmask))
return;
// check for overlap with a command
- if (Cmd_Exists (name))
+ if (Cmd_Exists(&cmd_client, name) || Cmd_Exists(&cmd_server, name))
{
VM_Warning(prog, "VM_registercvar: %s is a command\n", name);
return;
}
- Cvar_Get(name, value, flags, NULL);
+ Cvar_Get(prog->console_cmd->cvars, name, value, prog->console_cmd->cvars_flagsmask | flags, NULL);
PRVM_G_FLOAT(OFS_RETURN) = 1; // success
}
void VM_min(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNTRANGE(2, 8, VM_min);
- // LordHavoc: 3+ argument enhancement suggested by FrikaC
+ // LadyHavoc: 3+ argument enhancement suggested by FrikaC
if (prog->argc >= 3)
{
int i;
void VM_max(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNTRANGE(2, 8, VM_max);
- // LordHavoc: 3+ argument enhancement suggested by FrikaC
+ // LadyHavoc: 3+ argument enhancement suggested by FrikaC
if (prog->argc >= 3)
{
int i;
=========
*/
//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
-//this function originally written by KrimZon, made shorter by LordHavoc
+//this function originally written by KrimZon, made shorter by LadyHavoc
void VM_clcommand (prvm_prog_t *prog)
{
client_t *temp_client;
temp_client = host_client;
host_client = svs.clients + i;
- Cmd_ExecuteString (PRVM_G_STRING(OFS_PARM1), src_client, true);
+ Cmd_ExecuteString (&cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true);
host_client = temp_client;
}
=========
*/
//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
-//this function originally written by KrimZon, made shorter by LordHavoc
-//20040203: rewritten by LordHavoc (no longer uses allocations)
+//this function originally written by KrimZon, made shorter by LadyHavoc
+//20040203: rewritten by LadyHavoc (no longer uses allocations)
static int num_tokens = 0;
static int tokens[VM_STRINGTEMP_LENGTH / 2];
static int tokens_startpos[VM_STRINGTEMP_LENGTH / 2];
}
//string(float n) argv = #442; // returns a word from the tokenized string (returns nothing for an invalid index)
-//this function originally written by KrimZon, made shorter by LordHavoc
+//this function originally written by KrimZon, made shorter by LadyHavoc
void VM_argv (prvm_prog_t *prog)
{
int token_num;
float gettime(prvm_prog_t *prog)
=========
*/
-#ifdef CONFIG_CD
float CDAudio_GetPosition(void);
-#endif
void VM_gettime(prvm_prog_t *prog)
{
int timer_index;
case 3: // GETTIME_UPTIME
PRVM_G_FLOAT(OFS_RETURN) = realtime;
break;
-#ifdef CONFIG_CD
case 4: // GETTIME_CDTRACK
PRVM_G_FLOAT(OFS_RETURN) = CDAudio_GetPosition();
break;
-#endif
default:
VM_Warning(prog, "VM_gettime: %s: unsupported timer specified, returning realtime\n", prog->name);
PRVM_G_FLOAT(OFS_RETURN) = realtime;
void VM_precache_pic(prvm_prog_t *prog)
{
const char *s;
- int flags = 0;
+ int flags = CACHEPICFLAG_FAILONMISSING;
VM_SAFEPARMCOUNTRANGE(1, 2, VM_precache_pic);
antiispattern = antipartial && (strchr(antipartial, '*') || strchr(antipartial, '?'));
n = 0;
- for(cvar = cvar_vars; cvar; cvar = cvar->next)
+ for(cvar = prog->console_cmd->cvars->vars; cvar; cvar = cvar->next)
{
if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
continue;
stringbuffer->strings = (char **)Mem_Alloc(prog->progs_mempool, sizeof(stringbuffer->strings[0]) * stringbuffer->max_strings);
n = 0;
- for(cvar = cvar_vars; cvar; cvar = cvar->next)
+ for(cvar = prog->console_cmd->cvars->vars; cvar; cvar = cvar->next)
{
if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
continue;