ddef_t *PRVM_ED_FieldAtOfs(int ofs);
qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash);
-// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
-#ifdef PRVM_BOUNDSCHECK_CVAR
-cvar_t prvm_boundscheck = {0, "prvm_boundscheck", "1", "enables detection of out of bounds memory access in the QuakeC code being run (in other words, prevents really exceedingly bad QuakeC code from doing nasty things to your computer)"};
-#endif
// LordHavoc: prints every opcode as it executes - warning: this is significant spew
cvar_t prvm_traceqc = {0, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"};
// LordHavoc: counts usage of each QuakeC statement
cvar_t prvm_backtraceforwarnings = {0, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"};
cvar_t prvm_leaktest = {0, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"};
cvar_t prvm_leaktest_ignore_classnames = {0, "prvm_leaktest_ignore_classnames", "", "classnames of entities to NOT leak check because they are found by find(world, classname, ...) but are actually spawned by QC code (NOT map entities)"};
+cvar_t prvm_errordump = {0, "prvm_errordump", "0", "write a savegame on crash to crash-server.dmp"};
+cvar_t prvm_reuseedicts_startuptime = {0, "prvm_reuseedicts_startuptime", "2", "allows immediate re-use of freed entity slots during start of new level (value in seconds)"};
+cvar_t prvm_reuseedicts_neverinsameframe = {0, "prvm_reuseedicts_neverinsameframe", "1", "never allows re-use of freed entity slots during same frame"};
+
+qboolean prvm_runawaycheck = true;
+
+// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
+// enables detection of out of bounds memory access in the QuakeC code being run (in other words, prevents really exceedingly bad QuakeC code from doing nasty things to your computer)
+qboolean prvm_boundscheck = true;
extern sizebuf_t vm_tempstringsbuf;
prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size);
// alloc edict fields
- prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size);
+ prog->entityfieldsarea = prog->entityfields * prog->max_edicts;
+ prog->edictsfields = (vec_t *)Mem_Alloc(prog->progs_mempool, prog->entityfieldsarea * sizeof(vec_t));
// set edict pointers
for(i = 0; i < prog->max_edicts; i++)
{
prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size);
- prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+ prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields;
}
}
void PRVM_MEM_IncreaseEdicts(void)
{
int i;
- int oldmaxedicts = prog->max_edicts;
- void *oldedictsfields = prog->edictsfields;
- void *oldedictprivate = prog->edictprivate;
if(prog->max_edicts >= prog->limit_edicts)
return;
// increase edicts
prog->max_edicts = min(prog->max_edicts + 256, prog->limit_edicts);
- prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size);
- prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size);
-
- memcpy(prog->edictsfields, oldedictsfields, oldmaxedicts * prog->edict_size);
- memcpy(prog->edictprivate, oldedictprivate, oldmaxedicts * prog->edictprivate_size);
+ prog->entityfieldsarea = prog->entityfields * prog->max_edicts;
+ prog->edictsfields = (vec_t*)Mem_Realloc(prog->progs_mempool, (void *)prog->edictsfields, prog->entityfieldsarea * sizeof(vec_t));
+ prog->edictprivate = (void *)Mem_Realloc(prog->progs_mempool, (void *)prog->edictprivate, prog->max_edicts * prog->edictprivate_size);
//set e and v pointers
for(i = 0; i < prog->max_edicts; i++)
{
prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size);
- prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+ prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields;
}
PRVM_GCALL(end_increase_edicts)();
-
- Mem_Free(oldedictsfields);
- Mem_Free(oldedictprivate);
}
//============================================================================
PRVM_GCALL(init_edict)(e);
}
-const char *PRVM_AllocationOrigin()
+const char *PRVM_AllocationOrigin(void)
{
char *buf = NULL;
if(prog->leaktest_active)
return buf;
}
+/*
+=================
+PRVM_ED_CanAlloc
+
+Returns if this particular edict could get allocated by PRVM_ED_Alloc
+=================
+*/
+qboolean PRVM_ED_CanAlloc(prvm_edict_t *e)
+{
+ if(!e->priv.required->free)
+ return false;
+ if(realtime <= e->priv.required->freetime && prvm_reuseedicts_neverinsameframe.integer)
+ return false; // never allow reuse in same frame (causes networking trouble)
+ if(e->priv.required->freetime < prog->starttime + prvm_reuseedicts_startuptime.value)
+ return true;
+ if(realtime > e->priv.required->freetime + 1)
+ return true;
+ return false; // entity slot still blocked because the entity was freed less than one second ago
+}
+
/*
=================
PRVM_ED_Alloc
for (i = prog->reserved_edicts + 1;i < prog->num_edicts;i++)
{
e = PRVM_EDICT_NUM(i);
- // the first couple seconds of server time can involve a lot of
- // freeing and allocating, so relax the replacement policy
- if (e->priv.required->free && ( e->priv.required->freetime < 2 || prog->globaloffsets.time < 0 || (PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float - e->priv.required->freetime) > 0.5 ) )
+ if(PRVM_ED_CanAlloc(e))
{
PRVM_ED_ClearEdict (e);
e->priv.required->allocation_origin = PRVM_AllocationOrigin();
PRVM_GCALL(free_edict)(ed);
ed->priv.required->free = true;
- ed->priv.required->freetime = prog->globaloffsets.time >= 0 ? PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float : 0;
+ ed->priv.required->freetime = realtime;
if(ed->priv.required->allocation_origin)
{
PRVM_Free((char *)ed->priv.required->allocation_origin);
break;
case ev_entity:
n = val->edict;
- if (n < 0 || n >= prog->limit_edicts)
+ if (n < 0 || n >= prog->max_edicts)
dpsnprintf (line, sizeof(line), "entity %i (invalid!)", n);
else
dpsnprintf (line, sizeof(line), "entity %i", n);
line[i++] = '\\';
line[i++] = '\\';
}
+ else if (*s == '"')
+ {
+ line[i++] = '\\';
+ line[i++] = '"';
+ }
else
line[i++] = *s;
s++;
// Didn't match; skip
continue;
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
type = d->type & ~DEF_SAVEGLOBAL;
For savegames
=============
*/
+extern cvar_t developer_entityparsing;
void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
{
ddef_t *d;
{
d = &prog->fielddefs[i];
name = PRVM_GetString(d->s_name);
+
+ if(developer_entityparsing.integer)
+ Con_Printf("PRVM_ED_Write: at entity %d field %s\n", PRVM_NUM_FOR_EDICT(ed), name);
+
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
type = d->type & ~DEF_SAVEGLOBAL;
continue;
FS_Printf(f,"\"%s\" ",name);
+ prog->statestring = va("PRVM_ED_Write, ent=%d, name=%s", i, name);
FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v));
+ prog->statestring = NULL;
}
FS_Print(f, "}\n");
continue;
name = PRVM_GetString(def->s_name);
+
+ if(developer_entityparsing.integer)
+ Con_Printf("PRVM_ED_WriteGlobals: at global %s\n", name);
+
+ prog->statestring = va("PRVM_ED_WriteGlobals, name=%s", name);
FS_Printf(f,"\"%s\" ", name);
FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs]));
+ prog->statestring = NULL;
}
FS_Print(f,"}\n");
}
if (com_token[0] == '}')
break;
+ if (developer_entityparsing.integer)
+ Con_Printf("Key: \"%s\"", com_token);
+
strlcpy (keyname, com_token, sizeof(keyname));
// parse value
if (!COM_ParseToken_Simple(&data, false, true))
PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
+ if (developer_entityparsing.integer)
+ Con_Printf(" \"%s\"\n", com_token);
+
if (com_token[0] == '}')
PRVM_ERROR ("PRVM_ED_ParseGlobals: closing brace without data");
mfunction_t *func;
if (ent)
- val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
+ val = (prvm_eval_t *)(ent->fields.vp + key->ofs);
else
- val = (prvm_eval_t *)((int *)prog->globals.generic + key->ofs);
+ val = (prvm_eval_t *)(prog->globals.generic + key->ofs);
switch (key->type & ~DEF_SAVEGLOBAL)
{
case ev_string:
break;
case ev_float:
- while (*s && *s <= ' ')
+ while (*s && ISWHITESPACE(*s))
s++;
val->_float = atof(s);
break;
case ev_vector:
for (i = 0;i < 3;i++)
{
- while (*s && *s <= ' ')
+ while (*s && ISWHITESPACE(*s))
s++;
if (!*s)
break;
val->vector[i] = atof(s);
- while (*s > ' ')
+ while (!ISWHITESPACE(*s))
s++;
if (!*s)
break;
break;
case ev_entity:
- while (*s && *s <= ' ')
+ while (*s && ISWHITESPACE(*s))
s++;
i = atoi(s);
if (i >= prog->limit_edicts)
- Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, (unsigned int)MAX_EDICTS, PRVM_NAME);
+ Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, prog->limit_edicts, PRVM_NAME);
while (i >= prog->max_edicts)
PRVM_MEM_IncreaseEdicts();
// if IncreaseEdicts was called the base pointer needs to be updated
if (ent)
- val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
+ val = (prvm_eval_t *)(ent->fields.vp + key->ofs);
val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i));
break;
PRVM_GameCommand("menu", "menu_cmd");
}
+/*
+=============
+PRVM_ED_EdictGet_f
+
+Console command to load a field of a specified edict
+=============
+*/
+void PRVM_ED_EdictGet_f(void)
+{
+ prvm_edict_t *ed;
+ ddef_t *key;
+ const char *s;
+ prvm_eval_t *v;
+
+ if(Cmd_Argc() != 4 && Cmd_Argc() != 5)
+ {
+ Con_Print("prvm_edictget <program name> <edict number> <field> [<cvar>]\n");
+ return;
+ }
+
+ PRVM_Begin;
+ if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ {
+ Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ return;
+ }
+
+ ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(2)));
+
+ if((key = PRVM_ED_FindField(Cmd_Argv(3))) == 0)
+ {
+ Con_Printf("Key %s not found !\n", Cmd_Argv(3));
+ goto fail;
+ }
+
+ v = (prvm_eval_t *)(ed->fields.vp + key->ofs);
+ s = PRVM_UglyValueString(key->type, v);
+ if(Cmd_Argc() == 5)
+ {
+ cvar_t *cvar = Cvar_FindVar(Cmd_Argv(4));
+ if (cvar && cvar->flags & CVAR_READONLY)
+ {
+ Con_Printf("prvm_edictget: %s is read-only\n", cvar->name);
+ goto fail;
+ }
+ Cvar_Get(Cmd_Argv(4), s, 0, NULL);
+ }
+ else
+ Con_Printf("%s\n", s);
+
+fail:
+ PRVM_End;
+}
+
+void PRVM_ED_GlobalGet_f(void)
+{
+ ddef_t *key;
+ const char *s;
+ prvm_eval_t *v;
+
+ if(Cmd_Argc() != 3 && Cmd_Argc() != 4)
+ {
+ Con_Print("prvm_globalget <program name> <global> [<cvar>]\n");
+ return;
+ }
+
+ PRVM_Begin;
+ if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ {
+ Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ return;
+ }
+
+ key = PRVM_ED_FindGlobal(Cmd_Argv(2));
+ if(!key)
+ {
+ Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) );
+ goto fail;
+ }
+
+ v = (prvm_eval_t *) &prog->globals.generic[key->ofs];
+ s = PRVM_UglyValueString(key->type, v);
+ if(Cmd_Argc() == 4)
+ {
+ cvar_t *cvar = Cvar_FindVar(Cmd_Argv(3));
+ if (cvar && cvar->flags & CVAR_READONLY)
+ {
+ Con_Printf("prvm_globalget: %s is read-only\n", cvar->name);
+ goto fail;
+ }
+ Cvar_Get(Cmd_Argv(3), s, 0, NULL);
+ }
+ else
+ Con_Printf("%s\n", s);
+
+fail:
+ PRVM_End;
+}
+
/*
=============
PRVM_ED_EdictSet_f
Used for initial level load and for savegames.
====================
*/
-extern cvar_t developer_entityparsing;
const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
{
ddef_t *key;
continue;
}
+ if (prog->funcoffsets.SV_OnEntityPreSpawnFunction)
+ {
+ // self = ent
+ PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
+ PRVM_ExecuteProgram (prog->funcoffsets.SV_OnEntityPreSpawnFunction, "QC function SV_OnEntityPreSpawnFunction is missing");
+ }
+
+ if(ent->priv.required->free)
+ {
+ inhibited++;
+ continue;
+ }
+
//
// immediately call spawn function, but only if there is a self global and a classname
//
+ if(!ent->priv.required->free)
if(prog->globaloffsets.self >= 0 && prog->fieldoffsets.classname >= 0)
{
string_t handle = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.classname)->string;
PRVM_ED_Print(ent, NULL);
}
PRVM_ED_Free (ent);
- continue;
+ continue; // not included in "inhibited" count
}
}
else
}
}
+ if(!ent->priv.required->free)
+ if (prog->funcoffsets.SV_OnEntityPostSpawnFunction)
+ {
+ // self = ent
+ PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
+ PRVM_ExecuteProgram (prog->funcoffsets.SV_OnEntityPostSpawnFunction, "QC function SV_OnEntityPostSpawnFunction is missing");
+ }
+
spawned++;
if (ent->priv.required->free)
died++;
// server and client qc use a lot of similar fields, so this is combined
prog->fieldoffsets.SendEntity = PRVM_ED_FindFieldOffset("SendEntity");
+ prog->fieldoffsets.SendFlags = PRVM_ED_FindFieldOffset("SendFlags");
prog->fieldoffsets.Version = PRVM_ED_FindFieldOffset("Version");
prog->fieldoffsets.alpha = PRVM_ED_FindFieldOffset("alpha");
prog->fieldoffsets.ammo_cells1 = PRVM_ED_FindFieldOffset("ammo_cells1");
prog->fieldoffsets.buttonuse = PRVM_ED_FindFieldOffset("buttonuse");
prog->fieldoffsets.chain = PRVM_ED_FindFieldOffset("chain");
prog->fieldoffsets.classname = PRVM_ED_FindFieldOffset("classname");
+ prog->fieldoffsets.clientcamera = PRVM_ED_FindFieldOffset("clientcamera");
prog->fieldoffsets.clientcolors = PRVM_ED_FindFieldOffset("clientcolors");
+ prog->fieldoffsets.clientstatus = PRVM_ED_FindFieldOffset("clientstatus");
prog->fieldoffsets.color = PRVM_ED_FindFieldOffset("color");
prog->fieldoffsets.colormod = PRVM_ED_FindFieldOffset("colormod");
prog->fieldoffsets.contentstransition = PRVM_ED_FindFieldOffset("contentstransition");
prog->fieldoffsets.frame1time = PRVM_ED_FindFieldOffset("frame1time");
prog->fieldoffsets.frame2 = PRVM_ED_FindFieldOffset("frame2");
prog->fieldoffsets.frame2time = PRVM_ED_FindFieldOffset("frame2time");
+ prog->fieldoffsets.frame3 = PRVM_ED_FindFieldOffset("frame3");
+ prog->fieldoffsets.frame3time = PRVM_ED_FindFieldOffset("frame3time");
+ prog->fieldoffsets.frame4 = PRVM_ED_FindFieldOffset("frame4");
+ prog->fieldoffsets.frame4time = PRVM_ED_FindFieldOffset("frame4time");
prog->fieldoffsets.fullbright = PRVM_ED_FindFieldOffset("fullbright");
prog->fieldoffsets.glow_color = PRVM_ED_FindFieldOffset("glow_color");
prog->fieldoffsets.glow_size = PRVM_ED_FindFieldOffset("glow_size");
prog->fieldoffsets.glow_trail = PRVM_ED_FindFieldOffset("glow_trail");
+ prog->fieldoffsets.glowmod = PRVM_ED_FindFieldOffset("glowmod");
prog->fieldoffsets.gravity = PRVM_ED_FindFieldOffset("gravity");
prog->fieldoffsets.groundentity = PRVM_ED_FindFieldOffset("groundentity");
prog->fieldoffsets.hull = PRVM_ED_FindFieldOffset("hull");
prog->fieldoffsets.idealpitch = PRVM_ED_FindFieldOffset("idealpitch");
prog->fieldoffsets.items2 = PRVM_ED_FindFieldOffset("items2");
prog->fieldoffsets.lerpfrac = PRVM_ED_FindFieldOffset("lerpfrac");
+ prog->fieldoffsets.lerpfrac3 = PRVM_ED_FindFieldOffset("lerpfrac3");
+ prog->fieldoffsets.lerpfrac4 = PRVM_ED_FindFieldOffset("lerpfrac4");
prog->fieldoffsets.light_lev = PRVM_ED_FindFieldOffset("light_lev");
prog->fieldoffsets.message = PRVM_ED_FindFieldOffset("message");
prog->fieldoffsets.modelflags = PRVM_ED_FindFieldOffset("modelflags");
prog->fieldoffsets.renderflags = PRVM_ED_FindFieldOffset("renderflags");
prog->fieldoffsets.rendermode = PRVM_ED_FindFieldOffset("rendermode"); // HalfLife support
prog->fieldoffsets.scale = PRVM_ED_FindFieldOffset("scale");
+ prog->fieldoffsets.shadertime = PRVM_ED_FindFieldOffset("shadertime");
+ prog->fieldoffsets.skeletonindex = PRVM_ED_FindFieldOffset("skeletonindex");
prog->fieldoffsets.style = PRVM_ED_FindFieldOffset("style");
prog->fieldoffsets.tag_entity = PRVM_ED_FindFieldOffset("tag_entity");
prog->fieldoffsets.tag_index = PRVM_ED_FindFieldOffset("tag_index");
prog->fieldoffsets.viewmodelforclient = PRVM_ED_FindFieldOffset("viewmodelforclient");
prog->fieldoffsets.viewzoom = PRVM_ED_FindFieldOffset("viewzoom");
prog->fieldoffsets.yaw_speed = PRVM_ED_FindFieldOffset("yaw_speed");
- prog->fieldoffsets.clientcamera = PRVM_ED_FindFieldOffset("clientcamera");
+ prog->fieldoffsets.bouncefactor = PRVM_ED_FindFieldOffset("bouncefactor");
+ prog->fieldoffsets.bouncestop = PRVM_ED_FindFieldOffset("bouncestop");
+
+ prog->fieldoffsets.solid = PRVM_ED_FindFieldOffset("solid");
+ prog->fieldoffsets.movetype = PRVM_ED_FindFieldOffset("movetype");
+ prog->fieldoffsets.modelindex = PRVM_ED_FindFieldOffset("modelindex");
+ prog->fieldoffsets.mins = PRVM_ED_FindFieldOffset("mins");
+ prog->fieldoffsets.maxs = PRVM_ED_FindFieldOffset("maxs");
+ prog->fieldoffsets.mass = PRVM_ED_FindFieldOffset("mass");
+ prog->fieldoffsets.origin = PRVM_ED_FindFieldOffset("origin");
+ prog->fieldoffsets.velocity = PRVM_ED_FindFieldOffset("velocity");
+ //prog->fieldoffsets.axis_forward = PRVM_ED_FindFieldOffset("axis_forward");
+ //prog->fieldoffsets.axis_left = PRVM_ED_FindFieldOffset("axis_left");
+ //prog->fieldoffsets.axis_up = PRVM_ED_FindFieldOffset("axis_up");
+ //prog->fieldoffsets.spinvelocity = PRVM_ED_FindFieldOffset("spinvelocity");
+ prog->fieldoffsets.angles = PRVM_ED_FindFieldOffset("angles");
+ prog->fieldoffsets.avelocity = PRVM_ED_FindFieldOffset("avelocity");
+ prog->fieldoffsets.aiment = PRVM_ED_FindFieldOffset("aiment");
+ prog->fieldoffsets.enemy = PRVM_ED_FindFieldOffset("enemy");
+ prog->fieldoffsets.jointtype = PRVM_ED_FindFieldOffset("jointtype");
+ prog->fieldoffsets.movedir = PRVM_ED_FindFieldOffset("movedir");
+
prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
- prog->funcoffsets.CSQC_Ent_Update = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
prog->funcoffsets.CSQC_Ent_Spawn = PRVM_ED_FindFunctionOffset("CSQC_Ent_Spawn");
+ prog->funcoffsets.CSQC_Ent_Update = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
prog->funcoffsets.CSQC_Event = PRVM_ED_FindFunctionOffset("CSQC_Event");
prog->funcoffsets.CSQC_Event_Sound = PRVM_ED_FindFunctionOffset("CSQC_Event_Sound");
prog->funcoffsets.CSQC_Init = PRVM_ED_FindFunctionOffset("CSQC_Init");
prog->funcoffsets.CSQC_Parse_TempEntity = PRVM_ED_FindFunctionOffset("CSQC_Parse_TempEntity");
prog->funcoffsets.CSQC_Shutdown = PRVM_ED_FindFunctionOffset("CSQC_Shutdown");
prog->funcoffsets.CSQC_UpdateView = PRVM_ED_FindFunctionOffset("CSQC_UpdateView");
- prog->funcoffsets.Gecko_Query = PRVM_ED_FindFunctionOffset("Gecko_Query");
prog->funcoffsets.EndFrame = PRVM_ED_FindFunctionOffset("EndFrame");
+ prog->funcoffsets.GameCommand = PRVM_ED_FindFunctionOffset("GameCommand");
+ prog->funcoffsets.Gecko_Query = PRVM_ED_FindFunctionOffset("Gecko_Query");
prog->funcoffsets.RestoreGame = PRVM_ED_FindFunctionOffset("RestoreGame");
prog->funcoffsets.SV_ChangeTeam = PRVM_ED_FindFunctionOffset("SV_ChangeTeam");
+ prog->funcoffsets.SV_OnEntityNoSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityNoSpawnFunction");
+ prog->funcoffsets.SV_OnEntityPostSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityPostSpawnFunction");
+ prog->funcoffsets.SV_OnEntityPreSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityPreSpawnFunction");
prog->funcoffsets.SV_ParseClientCommand = PRVM_ED_FindFunctionOffset("SV_ParseClientCommand");
+ prog->funcoffsets.SV_PausedTic = PRVM_ED_FindFunctionOffset("SV_PausedTic");
prog->funcoffsets.SV_PlayerPhysics = PRVM_ED_FindFunctionOffset("SV_PlayerPhysics");
- prog->funcoffsets.SV_OnEntityNoSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityNoSpawnFunction");
- prog->funcoffsets.GameCommand = PRVM_ED_FindFunctionOffset("GameCommand");
prog->funcoffsets.SV_Shutdown = PRVM_ED_FindFunctionOffset("SV_Shutdown");
+ prog->funcoffsets.URI_Get_Callback = PRVM_ED_FindFunctionOffset("URI_Get_Callback");
prog->globaloffsets.SV_InitCmd = PRVM_ED_FindGlobalOffset("SV_InitCmd");
+ prog->globaloffsets.coop = PRVM_ED_FindGlobalOffset("coop");
+ prog->globaloffsets.deathmatch = PRVM_ED_FindGlobalOffset("deathmatch");
+ prog->globaloffsets.dmg_origin = PRVM_ED_FindGlobalOffset("dmg_origin");
+ prog->globaloffsets.dmg_save = PRVM_ED_FindGlobalOffset("dmg_save");
+ prog->globaloffsets.dmg_take = PRVM_ED_FindGlobalOffset("dmg_take");
+ prog->globaloffsets.drawfont = PRVM_ED_FindGlobalOffset("drawfont");
+ prog->globaloffsets.gettaginfo_forward = PRVM_ED_FindGlobalOffset("gettaginfo_forward");
+ prog->globaloffsets.gettaginfo_name = PRVM_ED_FindGlobalOffset("gettaginfo_name");
+ prog->globaloffsets.gettaginfo_offset = PRVM_ED_FindGlobalOffset("gettaginfo_offset");
+ prog->globaloffsets.gettaginfo_parent = PRVM_ED_FindGlobalOffset("gettaginfo_parent");
+ prog->globaloffsets.gettaginfo_right = PRVM_ED_FindGlobalOffset("gettaginfo_right");
+ prog->globaloffsets.gettaginfo_up = PRVM_ED_FindGlobalOffset("gettaginfo_up");
+ prog->globaloffsets.transparent_offset = PRVM_ED_FindGlobalOffset("transparent_offset");
+ prog->globaloffsets.intermission = PRVM_ED_FindGlobalOffset("intermission");
+ prog->globaloffsets.require_spawnfunc_prefix = PRVM_ED_FindGlobalOffset("require_spawnfunc_prefix");
+ prog->globaloffsets.sb_showscores = PRVM_ED_FindGlobalOffset("sb_showscores");
prog->globaloffsets.self = PRVM_ED_FindGlobalOffset("self");
+ prog->globaloffsets.serverdeltatime = PRVM_ED_FindGlobalOffset("serverdeltatime");
+ prog->globaloffsets.serverprevtime = PRVM_ED_FindGlobalOffset("serverprevtime");
+ prog->globaloffsets.servertime = PRVM_ED_FindGlobalOffset("servertime");
prog->globaloffsets.time = PRVM_ED_FindGlobalOffset("time");
- prog->globaloffsets.v_forward = PRVM_ED_FindGlobalOffset("v_forward");
- prog->globaloffsets.v_right = PRVM_ED_FindGlobalOffset("v_right");
- prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up");
- prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles");
prog->globaloffsets.trace_allsolid = PRVM_ED_FindGlobalOffset("trace_allsolid");
- prog->globaloffsets.trace_startsolid = PRVM_ED_FindGlobalOffset("trace_startsolid");
- prog->globaloffsets.trace_fraction = PRVM_ED_FindGlobalOffset("trace_fraction");
- prog->globaloffsets.trace_inwater = PRVM_ED_FindGlobalOffset("trace_inwater");
- prog->globaloffsets.trace_inopen = PRVM_ED_FindGlobalOffset("trace_inopen");
- prog->globaloffsets.trace_endpos = PRVM_ED_FindGlobalOffset("trace_endpos");
- prog->globaloffsets.trace_plane_normal = PRVM_ED_FindGlobalOffset("trace_plane_normal");
- prog->globaloffsets.trace_plane_dist = PRVM_ED_FindGlobalOffset("trace_plane_dist");
- prog->globaloffsets.trace_ent = PRVM_ED_FindGlobalOffset("trace_ent");
prog->globaloffsets.trace_dphitcontents = PRVM_ED_FindGlobalOffset("trace_dphitcontents");
prog->globaloffsets.trace_dphitq3surfaceflags = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags");
prog->globaloffsets.trace_dphittexturename = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
prog->globaloffsets.trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
- prog->globaloffsets.intermission = PRVM_ED_FindGlobalOffset("intermission");
- prog->globaloffsets.coop = PRVM_ED_FindGlobalOffset("coop");
- prog->globaloffsets.deathmatch = PRVM_ED_FindGlobalOffset("deathmatch");
- prog->globaloffsets.dmg_take = PRVM_ED_FindGlobalOffset("dmg_take");
- prog->globaloffsets.dmg_save = PRVM_ED_FindGlobalOffset("dmg_save");
- prog->globaloffsets.dmg_origin = PRVM_ED_FindGlobalOffset("dmg_origin");
- prog->globaloffsets.sb_showscores = PRVM_ED_FindGlobalOffset("sb_showscores");
- prog->globaloffsets.drawfont = PRVM_ED_FindGlobalOffset("drawfont");
- prog->globaloffsets.require_spawnfunc_prefix = PRVM_ED_FindGlobalOffset("require_spawnfunc_prefix");
+ prog->globaloffsets.trace_endpos = PRVM_ED_FindGlobalOffset("trace_endpos");
+ prog->globaloffsets.trace_ent = PRVM_ED_FindGlobalOffset("trace_ent");
+ prog->globaloffsets.trace_fraction = PRVM_ED_FindGlobalOffset("trace_fraction");
+ prog->globaloffsets.trace_inopen = PRVM_ED_FindGlobalOffset("trace_inopen");
+ prog->globaloffsets.trace_inwater = PRVM_ED_FindGlobalOffset("trace_inwater");
+ prog->globaloffsets.trace_networkentity = PRVM_ED_FindGlobalOffset("trace_networkentity");
+ prog->globaloffsets.trace_plane_dist = PRVM_ED_FindGlobalOffset("trace_plane_dist");
+ prog->globaloffsets.trace_plane_normal = PRVM_ED_FindGlobalOffset("trace_plane_normal");
+ prog->globaloffsets.trace_startsolid = PRVM_ED_FindGlobalOffset("trace_startsolid");
+ prog->globaloffsets.v_forward = PRVM_ED_FindGlobalOffset("v_forward");
+ prog->globaloffsets.v_right = PRVM_ED_FindGlobalOffset("v_right");
+ prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up");
+ prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles");
+ prog->globaloffsets.worldstatus = PRVM_ED_FindGlobalOffset("worldstatus");
// menu qc only uses some functions, nothing else
prog->funcoffsets.m_draw = PRVM_ED_FindFunctionOffset("m_draw");
===============
*/
-void PRVM_LeakTest();
-void PRVM_ResetProg()
+void PRVM_LeakTest(void);
+void PRVM_ResetProg(void)
{
PRVM_LeakTest();
PRVM_GCALL(reset_cmd)();
prog->progs = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false, &filesize);
if (prog->progs == NULL || filesize < (fs_offset_t)sizeof(dprograms_t))
PRVM_ERROR ("PRVM_LoadProgs: couldn't load %s for %s", filename, PRVM_NAME);
+ // TODO bounds check header fields (e.g. numstatements), they must never go behind end of file
Con_DPrintf("%s programs occupy %iK.\n", PRVM_NAME, (int)(filesize/1024));
prog->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof(*prog->statement_profile));
- // moved edict_size calculation down below field adding code
-
//pr_global_struct = (globalvars_t *)((unsigned char *)progs + progs->ofs_globals);
prog->globals.generic = (float *)((unsigned char *)prog->progs + prog->progs->ofs_globals);
prog->functions[i].numparms = LittleLong (dfunctions[i].numparms);
prog->functions[i].locals = LittleLong (dfunctions[i].locals);
memcpy(prog->functions[i].parm_size, dfunctions[i].parm_size, sizeof(dfunctions[i].parm_size));
+ if(prog->functions[i].first_statement >= prog->progs->numstatements)
+ PRVM_ERROR("PRVM_LoadProgs: out of bounds function statement (function %d) in %s", i, PRVM_NAME);
+ // TODO bounds check parm_start, s_name, s_file, numparms, locals, parm_size
}
for (i=0 ; i<prog->progs->numglobaldefs ; i++)
prog->globaldefs[i].type = LittleShort (prog->globaldefs[i].type);
prog->globaldefs[i].ofs = LittleShort (prog->globaldefs[i].ofs);
prog->globaldefs[i].s_name = LittleLong (prog->globaldefs[i].s_name);
+ // TODO bounds check ofs, s_name
}
// copy the progs fields to the new fields list
PRVM_ERROR ("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", PRVM_NAME);
prog->fielddefs[i].ofs = LittleShort (infielddefs[i].ofs);
prog->fielddefs[i].s_name = LittleLong (infielddefs[i].s_name);
+ // TODO bounds check ofs, s_name
}
// append the required fields
prog->fielddefs[prog->progs->numfielddefs].type = required_field[i].type;
prog->fielddefs[prog->progs->numfielddefs].ofs = prog->progs->entityfields;
prog->fielddefs[prog->progs->numfielddefs].s_name = PRVM_SetEngineString(required_field[i].name);
+ // TODO bounds check ofs, s_name
if (prog->fielddefs[prog->progs->numfielddefs].type == ev_vector)
prog->progs->entityfields += 3;
else
prog->progs->entityfields++;
prog->progs->numfielddefs++;
}
+ prog->entityfields = prog->progs->entityfields;
// check required functions
for(i=0 ; i < numrequiredfunc ; i++)
for (i=0 ; i<prog->progs->numglobals ; i++)
((int *)prog->globals.generic)[i] = LittleLong (((int *)prog->globals.generic)[i]);
- // moved edict_size calculation down here, below field adding code
- // LordHavoc: this no longer includes the prvm_edict_t header
- prog->edict_size = prog->progs->entityfields * 4;
- prog->edictareasize = prog->edict_size * prog->limit_edicts;
-
// LordHavoc: bounds check anything static
for (i = 0,st = prog->statements;i < prog->progs->numstatements;i++,st++)
{
break;
}
}
+ if(prog->progs->numstatements < 1)
+ {
+ PRVM_ERROR("PRVM_LoadProgs: empty program in %s", PRVM_NAME);
+ }
+ else switch(prog->statements[prog->progs->numstatements - 1].op)
+ {
+ case OP_RETURN:
+ case OP_GOTO:
+ case OP_DONE:
+ break;
+ default:
+ PRVM_ERROR("PRVM_LoadProgs: program may fall off the edge (does not end with RETURN, GOTO or DONE) in %s", PRVM_NAME);
+ break;
+ }
PRVM_LoadLNO(filename);
PRVM_Init_Exec();
+ for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog->globaldefs[i].s_name);
+ //Con_Printf("found var %s\n", name);
+ if(name
+ && !strncmp(name, "autocvar_", 9)
+ && !(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z'))
+ )
+ {
+ prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs);
+ cvar_t *cvar = Cvar_FindVar(name + 9);
+ //Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, PRVM_NAME);
+ if(!cvar)
+ {
+ const char *value;
+ char buf[64];
+ Con_Printf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, PRVM_NAME);
+ switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
+ {
+ case ev_float:
+ if((float)((int)(val->_float)) == val->_float)
+ dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float));
+ else
+ dpsnprintf(buf, sizeof(buf), "%f", val->_float);
+ value = buf;
+ break;
+ case ev_vector:
+ dpsnprintf(buf, sizeof(buf), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]); value = buf;
+ break;
+ case ev_string:
+ value = PRVM_GetString(val->string);
+ break;
+ default:
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ goto fail;
+ }
+ cvar = Cvar_Get(name + 9, value, 0, NULL);
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ {
+ val->string = PRVM_SetEngineString(cvar->string);
+ cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+ }
+ if(!cvar)
+ PRVM_ERROR("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, PRVM_NAME);
+ cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+ cvar->globaldefindex[prog - prog_list] = i;
+ }
+ else if((cvar->flags & CVAR_PRIVATE) == 0)
+ {
+ // MUST BE SYNCED WITH cvar.c Cvar_Set
+ int j;
+ const char *s;
+ switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
+ {
+ case ev_float:
+ val->_float = cvar->value;
+ break;
+ case ev_vector:
+ s = cvar->string;
+ VectorClear(val->vector);
+ for (j = 0;j < 3;j++)
+ {
+ while (*s && ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ val->vector[j] = atof(s);
+ while (!ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ }
+ break;
+ case ev_string:
+ val->string = PRVM_SetEngineString(cvar->string);
+ cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+ break;
+ default:
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ goto fail;
+ }
+ cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+ cvar->globaldefindex[prog - prog_list] = i;
+ }
+ else
+ Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME);
+ }
+fail:
+ ;
+ }
+
prog->loaded = TRUE;
// set flags & ddef_ts in prog
name = PRVM_GetString(d->s_name);
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
for (j = 0;j < prvm_type_size[d->type & ~DEF_SAVEGLOBAL];j++)
{
Cmd_AddCommand ("prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)");
+ Cmd_AddCommand ("prvm_childprofile", PRVM_ChildProfile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu), sorted by time taken in function with child calls");
Cmd_AddCommand ("prvm_callprofile", PRVM_CallProfile_f, "prints execution statistics about the most time consuming QuakeC calls from the engine in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_fields", PRVM_Fields_f, "prints usage statistics on properties (how many entities have non-zero values) in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_edictset", PRVM_ED_EdictSet_f, "changes value of a specified property of a specified entity in the selected VM (server, client, menu)");
+ Cmd_AddCommand ("prvm_edictget", PRVM_ED_EdictGet_f, "retrieves the value of a specified property of a specified entity in the selected VM (server, client menu) into a cvar or to the console");
+ Cmd_AddCommand ("prvm_globalget", PRVM_ED_GlobalGet_f, "retrieves the value of a specified global variable in the selected VM (server, client menu) into a cvar or to the console");
Cmd_AddCommand ("prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)");
Cmd_AddCommand ("cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument");
Cmd_AddCommand ("menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
Cmd_AddCommand ("sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
- // LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
-#ifdef PRVM_BOUNDSCHECK_CVAR
- Cvar_RegisterVariable (&prvm_boundscheck);
-#endif
+
+ // COMMANDLINEOPTION: PRVM: -noboundscheck disables the bounds checks (security hole if CSQC is in use!)
+ prvm_boundscheck = !COM_CheckParm("-noboundscheck");
+
Cvar_RegisterVariable (&prvm_traceqc);
Cvar_RegisterVariable (&prvm_statementprofiling);
Cvar_RegisterVariable (&prvm_backtraceforwarnings);
Cvar_RegisterVariable (&prvm_leaktest);
Cvar_RegisterVariable (&prvm_leaktest_ignore_classnames);
+ Cvar_RegisterVariable (&prvm_errordump);
+ Cvar_RegisterVariable (&prvm_reuseedicts_startuptime);
+ Cvar_RegisterVariable (&prvm_reuseedicts_neverinsameframe);
+
+ // COMMANDLINEOPTION: PRVM: -norunaway disables the runaway loop check (it might be impossible to exit DarkPlaces if used!)
+ prvm_runawaycheck = !COM_CheckParm("-norunaway");
//VM_Cmd_Init();
}
*/
void PRVM_InitProg(int prognr)
{
+ static unsigned int progid = 0;
+
if(prognr < 0 || prognr >= PRVM_MAXPROGS)
Sys_Error("PRVM_InitProg: Invalid program number %i",prognr);
memset(prog, 0, sizeof(prvm_prog_t));
prog->starttime = Sys_DoubleTime();
+ prog->id = ++progid;
prog->error_cmd = Host_Error;
- prog->leaktest_active = prvm_leaktest.integer;
+ prog->leaktest_active = prvm_leaktest.integer != 0;
}
-int PRVM_GetProgNr()
+int PRVM_GetProgNr(void)
{
return prog - prog_list;
}
void *_PRVM_Alloc(size_t buffersize, const char *filename, int fileline)
{
- return _Mem_Alloc(prog->progs_mempool, buffersize, filename, fileline);
+ return _Mem_Alloc(prog->progs_mempool, NULL, buffersize, 16, filename, fileline);
}
void _PRVM_Free(void *buffer, const char *filename, int fileline)
return 0;
}
-/*
-int NUM_FOR_EDICT_ERROR(prvm_edict_t *e)
-{
- PRVM_ERROR ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->edicts);
- return 0;
-}
-
-int PRVM_NUM_FOR_EDICT(prvm_edict_t *e)
-{
- int n;
- n = e - prog->edicts;
- if ((unsigned int)n >= prog->limit_edicts)
- Host_Error ("PRVM_NUM_FOR_EDICT: bad pointer");
- return n;
-}
-
-//int NoCrash_NUM_FOR_EDICT(prvm_edict_t *e)
-//{
-// return e - prog->edicts;
-//}
-
-//#define PRVM_EDICT_TO_PROG(e) ((unsigned char *)(((prvm_edict_t *)e)->v) - (unsigned char *)(prog->edictsfields))
-//#define PRVM_PROG_TO_EDICT(e) (prog->edicts + ((e) / (progs->entityfields * 4)))
-int PRVM_EDICT_TO_PROG(prvm_edict_t *e)
-{
- int n;
- n = e - prog->edicts;
- if ((unsigned int)n >= (unsigned int)prog->max_edicts)
- Host_Error("PRVM_EDICT_TO_PROG: invalid edict %8p (number %i compared to world at %8p)", e, n, prog->edicts);
- return n;// EXPERIMENTAL
- //return (unsigned char *)e->v - (unsigned char *)prog->edictsfields;
-}
-prvm_edict_t *PRVM_PROG_TO_EDICT(int n)
-{
- if ((unsigned int)n >= (unsigned int)prog->max_edicts)
- Host_Error("PRVM_PROG_TO_EDICT: invalid edict number %i", n);
- return prog->edicts + n; // EXPERIMENTAL
- //return prog->edicts + ((n) / (progs->entityfields * 4));
-}
-*/
-
-
sizebuf_t vm_tempstringsbuf;
const char *PRVM_GetString(int num)
if (num < prog->numknownstrings)
{
if (!prog->knownstrings[num])
+ {
VM_Warning("PRVM_GetString: Invalid zone-string offset (%i has been freed)\n", num);
+ return "";
+ }
return prog->knownstrings[num];
}
else
}
}
+const char *PRVM_ChangeEngineString(int i, const char *s)
+{
+ const char *old;
+ i = -1 - i;
+ if(i < 0 || i >= prog->numknownstrings)
+ PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
+ old = prog->knownstrings[i];
+ prog->knownstrings[i] = s;
+ return old;
+}
+
int PRVM_SetEngineString(const char *s)
{
int i;
{
if (developer.integer >= 100)
Con_Printf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024);
- vm_tempstringsbuf.data = Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize);
+ vm_tempstringsbuf.data = (unsigned char *) Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize);
if (old.cursize)
memcpy(vm_tempstringsbuf.data, old.data, old.cursize);
if (old.data)
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
- if(string == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->string)
+ if(string == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->string)
return true;
}
}
{
// TODO someone add more stuff here
cl_entvars_t *ev = edict->fields.client;
+ if(ev->entnum) // csqc networked
+ return true;
if(ev->modelindex) // visible ent?
return true;
if(ev->effects) // particle effect?
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
continue;
- if(edictnum == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->edict)
+ if(edictnum == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->edict)
return true;
}
}
return false;
}
-static void PRVM_MarkReferencedEdicts()
+static void PRVM_MarkReferencedEdicts(void)
{
int j;
qboolean found_new;
Con_DPrintf("leak check used %d stages to find all references\n", stage);
}
-void PRVM_LeakTest()
+void PRVM_LeakTest(void)
{
int i, j;
qboolean leaked = false;
for (i = 0; i < (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray); ++i)
{
- prvm_stringbuffer_t *stringbuffer = Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);
+ prvm_stringbuffer_t *stringbuffer = (prvm_stringbuffer_t*) Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);
if(stringbuffer)
if(stringbuffer->origin)
{
projects / xonotic / darkplaces.git / blobdiff