#include "quakedef.h"
#include "progsvm.h"
+#include "csprogs.h"
-prvm_prog_t *prog;
-
-static prvm_prog_t prog_list[PRVM_MAXPROGS];
+prvm_prog_t prvm_prog_list[PRVM_PROG_MAX];
int prvm_type_size[8] = {1,sizeof(string_t)/4,1,3,1,1,sizeof(func_t)/4,sizeof(void *)/4};
-ddef_t *PRVM_ED_FieldAtOfs(int ofs);
-qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash);
+prvm_eval_t prvm_badvalue; // used only for error returns
+cvar_t prvm_language = {CVAR_SAVE, "prvm_language", "", "when set, loads progs.dat.LANGUAGENAME.po for string translations; when set to dump, progs.dat.pot is written from the strings in the progs"};
// 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_statementprofiling = {0, "prvm_statementprofiling", "0", "counts how many times each QuakeC statement has been executed, these counts are displayed in prvm_printfunction output (if enabled)"};
+cvar_t prvm_timeprofiling = {0, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"};
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_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"};
+static double prvm_reuseedicts_always_allow = 0;
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;
-
//============================================================================
// mempool handling
PRVM_MEM_Alloc
===============
*/
-void PRVM_MEM_Alloc(void)
+static void PRVM_MEM_Alloc(prvm_prog_t *prog)
{
int i;
PRVM_MEM_IncreaseEdicts
===============
*/
-void PRVM_MEM_IncreaseEdicts(void)
+void PRVM_MEM_IncreaseEdicts(prvm_prog_t *prog)
{
int i;
if(prog->max_edicts >= prog->limit_edicts)
return;
- PRVM_GCALL(begin_increase_edicts)();
+ prog->begin_increase_edicts(prog);
// increase edicts
prog->max_edicts = min(prog->max_edicts + 256, prog->limit_edicts);
prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields;
}
- PRVM_GCALL(end_increase_edicts)();
+ prog->end_increase_edicts(prog);
}
//============================================================================
// normal prvm
-int PRVM_ED_FindFieldOffset(const char *field)
+int PRVM_ED_FindFieldOffset(prvm_prog_t *prog, const char *field)
{
ddef_t *d;
- d = PRVM_ED_FindField(field);
+ d = PRVM_ED_FindField(prog, field);
if (!d)
return -1;
return d->ofs;
}
-int PRVM_ED_FindGlobalOffset(const char *global)
+int PRVM_ED_FindGlobalOffset(prvm_prog_t *prog, const char *global)
{
ddef_t *d;
- d = PRVM_ED_FindGlobal(global);
+ d = PRVM_ED_FindGlobal(prog, global);
if (!d)
return -1;
return d->ofs;
}
-func_t PRVM_ED_FindFunctionOffset(const char *function)
+func_t PRVM_ED_FindFunctionOffset(prvm_prog_t *prog, const char *function)
{
mfunction_t *f;
- f = PRVM_ED_FindFunction(function);
+ f = PRVM_ED_FindFunction(prog, function);
if (!f)
return 0;
return (func_t)(f - prog->functions);
}
-qboolean PRVM_ProgLoaded(int prognr)
-{
- if(prognr < 0 || prognr >= PRVM_MAXPROGS)
- return FALSE;
-
- return (prog_list[prognr].loaded ? TRUE : FALSE);
-}
-
/*
=================
-PRVM_SetProgFromString
+PRVM_ProgFromString
=================
*/
-// perhaps add a return value when the str doesnt exist
-qboolean PRVM_SetProgFromString(const char *str)
-{
- int i = 0;
- for(; i < PRVM_MAXPROGS ; i++)
- if(prog_list[i].name && !strcmp(prog_list[i].name,str))
- {
- if(prog_list[i].loaded)
- {
- prog = &prog_list[i];
- return TRUE;
- }
- else
- {
- Con_Printf("%s not loaded !\n",PRVM_NAME);
- return FALSE;
- }
- }
-
- Con_Printf("Invalid program name %s !\n", str);
- return FALSE;
+prvm_prog_t *PRVM_ProgFromString(const char *str)
+{
+ if (!strcmp(str, "server"))
+ return SVVM_prog;
+ if (!strcmp(str, "client"))
+ return CLVM_prog;
+ if (!strcmp(str, "menu"))
+ return MVM_prog;
+ return NULL;
}
/*
=================
-PRVM_SetProg
+PRVM_FriendlyProgFromString
=================
*/
-void PRVM_SetProg(int prognr)
+prvm_prog_t *PRVM_FriendlyProgFromString(const char *str)
{
- if(0 <= prognr && prognr < PRVM_MAXPROGS)
+ prvm_prog_t *prog = PRVM_ProgFromString(str);
+ if (!prog)
{
- if(prog_list[prognr].loaded)
- prog = &prog_list[prognr];
- else
- PRVM_ERROR("%i not loaded !", prognr);
- return;
+ Con_Printf("%s: unknown program name\n", str);
+ return NULL;
}
- PRVM_ERROR("Invalid program number %i", prognr);
+ if (!prog->loaded)
+ {
+ Con_Printf("%s: program is not loaded\n", str);
+ return NULL;
+ }
+ return prog;
}
/*
Sets everything to NULL
=================
*/
-void PRVM_ED_ClearEdict (prvm_edict_t *e)
+void PRVM_ED_ClearEdict(prvm_prog_t *prog, prvm_edict_t *e)
{
- memset (e->fields.vp, 0, prog->progs->entityfields * 4);
+ memset(e->fields.vp, 0, prog->entityfields * 4);
e->priv.required->free = false;
// AK: Let the init_edict function determine if something needs to be initialized
- PRVM_GCALL(init_edict)(e);
+ prog->init_edict(prog, e);
}
-const char *PRVM_AllocationOrigin(void)
+const char *PRVM_AllocationOrigin(prvm_prog_t *prog)
{
char *buf = NULL;
if(prog->leaktest_active)
if(prog->depth > 0) // actually in QC code and not just parsing the entities block of a map/savegame
{
buf = (char *)PRVM_Alloc(128);
- PRVM_ShortStackTrace(buf, 128);
+ PRVM_ShortStackTrace(prog, buf, 128);
}
return buf;
}
Returns if this particular edict could get allocated by PRVM_ED_Alloc
=================
*/
-qboolean PRVM_ED_CanAlloc(prvm_edict_t *e)
+qboolean PRVM_ED_CanAlloc(prvm_prog_t *prog, prvm_edict_t *e)
{
if(!e->priv.required->free)
return false;
- if(realtime <= e->priv.required->freetime && prvm_reuseedicts_neverinsameframe.integer)
+ if(prvm_reuseedicts_always_allow == realtime)
+ return true;
+ if(realtime <= e->priv.required->freetime + 0.1 && 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;
angles and bad trails.
=================
*/
-prvm_edict_t *PRVM_ED_Alloc (void)
+prvm_edict_t *PRVM_ED_Alloc(prvm_prog_t *prog)
{
- int i;
- prvm_edict_t *e;
+ int i;
+ prvm_edict_t *e;
// the client qc dont need maxclients
// thus it doesnt need to use svs.maxclients
for (i = prog->reserved_edicts + 1;i < prog->num_edicts;i++)
{
e = PRVM_EDICT_NUM(i);
- if(PRVM_ED_CanAlloc(e))
+ if(PRVM_ED_CanAlloc(prog, e))
{
- PRVM_ED_ClearEdict (e);
- e->priv.required->allocation_origin = PRVM_AllocationOrigin();
+ PRVM_ED_ClearEdict (prog, e);
+ e->priv.required->allocation_origin = PRVM_AllocationOrigin(prog);
return e;
}
}
if (i == prog->limit_edicts)
- PRVM_ERROR ("%s: PRVM_ED_Alloc: no free edicts",PRVM_NAME);
+ prog->error_cmd("%s: PRVM_ED_Alloc: no free edicts", prog->name);
prog->num_edicts++;
if (prog->num_edicts >= prog->max_edicts)
- PRVM_MEM_IncreaseEdicts();
+ PRVM_MEM_IncreaseEdicts(prog);
e = PRVM_EDICT_NUM(i);
- PRVM_ED_ClearEdict (e);
+ PRVM_ED_ClearEdict(prog, e);
- e->priv.required->allocation_origin = PRVM_AllocationOrigin();
+ e->priv.required->allocation_origin = PRVM_AllocationOrigin(prog);
return e;
}
FIXME: walk all entities and NULL out references to this entity
=================
*/
-void PRVM_ED_Free (prvm_edict_t *ed)
+void PRVM_ED_Free(prvm_prog_t *prog, prvm_edict_t *ed)
{
// dont delete the null entity (world) or reserved edicts
- if(PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts )
+ if (ed - prog->edicts <= prog->reserved_edicts)
return;
- PRVM_GCALL(free_edict)(ed);
+ prog->free_edict(prog, ed);
ed->priv.required->free = true;
ed->priv.required->freetime = realtime;
if(ed->priv.required->allocation_origin)
{
- PRVM_Free((char *)ed->priv.required->allocation_origin);
+ Mem_Free((char *)ed->priv.required->allocation_origin);
ed->priv.required->allocation_origin = NULL;
}
}
PRVM_ED_GlobalAtOfs
============
*/
-ddef_t *PRVM_ED_GlobalAtOfs (int ofs)
+static ddef_t *PRVM_ED_GlobalAtOfs (prvm_prog_t *prog, int ofs)
{
ddef_t *def;
int i;
- for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ for (i = 0;i < prog->numglobaldefs;i++)
{
def = &prog->globaldefs[i];
if (def->ofs == ofs)
PRVM_ED_FieldAtOfs
============
*/
-ddef_t *PRVM_ED_FieldAtOfs (int ofs)
+ddef_t *PRVM_ED_FieldAtOfs (prvm_prog_t *prog, int ofs)
{
ddef_t *def;
int i;
- for (i=0 ; i<prog->progs->numfielddefs ; i++)
+ for (i = 0;i < prog->numfielddefs;i++)
{
def = &prog->fielddefs[i];
if (def->ofs == ofs)
PRVM_ED_FindField
============
*/
-ddef_t *PRVM_ED_FindField (const char *name)
+ddef_t *PRVM_ED_FindField (prvm_prog_t *prog, const char *name)
{
ddef_t *def;
int i;
- for (i=0 ; i<prog->progs->numfielddefs ; i++)
+ for (i = 0;i < prog->numfielddefs;i++)
{
def = &prog->fielddefs[i];
- if (!strcmp(PRVM_GetString(def->s_name), name))
+ if (!strcmp(PRVM_GetString(prog, def->s_name), name))
return def;
}
return NULL;
PRVM_ED_FindGlobal
============
*/
-ddef_t *PRVM_ED_FindGlobal (const char *name)
+ddef_t *PRVM_ED_FindGlobal (prvm_prog_t *prog, const char *name)
{
ddef_t *def;
int i;
- for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ for (i = 0;i < prog->numglobaldefs;i++)
{
def = &prog->globaldefs[i];
- if (!strcmp(PRVM_GetString(def->s_name), name))
+ if (!strcmp(PRVM_GetString(prog, def->s_name), name))
return def;
}
return NULL;
PRVM_ED_FindFunction
============
*/
-mfunction_t *PRVM_ED_FindFunction (const char *name)
+mfunction_t *PRVM_ED_FindFunction (prvm_prog_t *prog, const char *name)
{
mfunction_t *func;
int i;
- for (i=0 ; i<prog->progs->numfunctions ; i++)
+ for (i = 0;i < prog->numfunctions;i++)
{
func = &prog->functions[i];
- if (!strcmp(PRVM_GetString(func->s_name), name))
+ if (!strcmp(PRVM_GetString(prog, func->s_name), name))
return func;
}
return NULL;
Returns a string describing *data in a type specific manner
=============
*/
-char *PRVM_ValueString (etype_t type, prvm_eval_t *val)
+static char *PRVM_ValueString (prvm_prog_t *prog, etype_t type, prvm_eval_t *val, char *line, size_t linelength)
{
- static char line[MAX_INPUTLINE];
ddef_t *def;
mfunction_t *f;
int n;
switch (type)
{
case ev_string:
- strlcpy (line, PRVM_GetString (val->string), sizeof (line));
+ strlcpy (line, PRVM_GetString (prog, val->string), linelength);
break;
case ev_entity:
n = val->edict;
if (n < 0 || n >= prog->max_edicts)
- dpsnprintf (line, sizeof(line), "entity %i (invalid!)", n);
+ dpsnprintf (line, linelength, "entity %i (invalid!)", n);
else
- dpsnprintf (line, sizeof(line), "entity %i", n);
+ dpsnprintf (line, linelength, "entity %i", n);
break;
case ev_function:
f = prog->functions + val->function;
- dpsnprintf (line, sizeof(line), "%s()", PRVM_GetString(f->s_name));
+ dpsnprintf (line, linelength, "%s()", PRVM_GetString(prog, f->s_name));
break;
case ev_field:
- def = PRVM_ED_FieldAtOfs ( val->_int );
- dpsnprintf (line, sizeof(line), ".%s", PRVM_GetString(def->s_name));
+ def = PRVM_ED_FieldAtOfs ( prog, val->_int );
+ dpsnprintf (line, linelength, ".%s", PRVM_GetString(prog, def->s_name));
break;
case ev_void:
- dpsnprintf (line, sizeof(line), "void");
+ dpsnprintf (line, linelength, "void");
break;
case ev_float:
// LordHavoc: changed from %5.1f to %10.4f
- dpsnprintf (line, sizeof(line), "%10.4f", val->_float);
+ dpsnprintf (line, linelength, "%10.4f", val->_float);
break;
case ev_vector:
// LordHavoc: changed from %5.1f to %10.4f
- dpsnprintf (line, sizeof(line), "'%10.4f %10.4f %10.4f'", val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, linelength, "'%10.4f %10.4f %10.4f'", val->vector[0], val->vector[1], val->vector[2]);
break;
case ev_pointer:
- dpsnprintf (line, sizeof(line), "pointer");
+ dpsnprintf (line, linelength, "pointer");
break;
default:
- dpsnprintf (line, sizeof(line), "bad type %i", (int) type);
+ dpsnprintf (line, linelength, "bad type %i", (int) type);
break;
}
Easier to parse than PR_ValueString
=============
*/
-char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
+char *PRVM_UglyValueString (prvm_prog_t *prog, etype_t type, prvm_eval_t *val, char *line, size_t linelength)
{
- static char line[MAX_INPUTLINE];
int i;
const char *s;
ddef_t *def;
// Parse the string a bit to turn special characters
// (like newline, specifically) into escape codes,
// this fixes saving games from various mods
- s = PRVM_GetString (val->string);
- for (i = 0;i < (int)sizeof(line) - 2 && *s;)
+ s = PRVM_GetString (prog, val->string);
+ for (i = 0;i < (int)linelength - 2 && *s;)
{
if (*s == '\n')
{
line[i] = '\0';
break;
case ev_entity:
- dpsnprintf (line, sizeof (line), "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
+ dpsnprintf (line, linelength, "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
break;
case ev_function:
f = prog->functions + val->function;
- strlcpy (line, PRVM_GetString (f->s_name), sizeof (line));
+ strlcpy (line, PRVM_GetString (prog, f->s_name), linelength);
break;
case ev_field:
- def = PRVM_ED_FieldAtOfs ( val->_int );
- dpsnprintf (line, sizeof (line), ".%s", PRVM_GetString(def->s_name));
+ def = PRVM_ED_FieldAtOfs ( prog, val->_int );
+ dpsnprintf (line, linelength, ".%s", PRVM_GetString(prog, def->s_name));
break;
case ev_void:
- dpsnprintf (line, sizeof (line), "void");
+ dpsnprintf (line, linelength, "void");
break;
case ev_float:
- dpsnprintf (line, sizeof (line), "%f", val->_float);
+ dpsnprintf (line, linelength, "%.9g", val->_float);
break;
case ev_vector:
- dpsnprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, linelength, "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]);
break;
default:
- dpsnprintf (line, sizeof (line), "bad type %i", type);
+ dpsnprintf (line, linelength, "bad type %i", type);
break;
}
padded to 20 field width
============
*/
-char *PRVM_GlobalString (int ofs)
+char *PRVM_GlobalString (prvm_prog_t *prog, int ofs, char *line, size_t linelength)
{
char *s;
//size_t i;
ddef_t *def;
void *val;
- static char line[128];
+ char valuebuf[MAX_INPUTLINE];
val = (void *)&prog->globals.generic[ofs];
- def = PRVM_ED_GlobalAtOfs(ofs);
+ def = PRVM_ED_GlobalAtOfs(prog, ofs);
if (!def)
- dpsnprintf (line, sizeof(line), "GLOBAL%i", ofs);
+ dpsnprintf (line, linelength, "GLOBAL%i", ofs);
else
{
- s = PRVM_ValueString ((etype_t)def->type, (prvm_eval_t *)val);
- dpsnprintf (line, sizeof(line), "%s (=%s)", PRVM_GetString(def->s_name), s);
+ s = PRVM_ValueString (prog, (etype_t)def->type, (prvm_eval_t *)val, valuebuf, sizeof(valuebuf));
+ dpsnprintf (line, linelength, "%s (=%s)", PRVM_GetString(prog, def->s_name), s);
}
//i = strlen(line);
return line;
}
-char *PRVM_GlobalStringNoContents (int ofs)
+char *PRVM_GlobalStringNoContents (prvm_prog_t *prog, int ofs, char *line, size_t linelength)
{
//size_t i;
ddef_t *def;
- static char line[128];
- def = PRVM_ED_GlobalAtOfs(ofs);
+ def = PRVM_ED_GlobalAtOfs(prog, ofs);
if (!def)
- dpsnprintf (line, sizeof(line), "GLOBAL%i", ofs);
+ dpsnprintf (line, linelength, "GLOBAL%i", ofs);
else
- dpsnprintf (line, sizeof(line), "%s", PRVM_GetString(def->s_name));
+ dpsnprintf (line, linelength, "%s", PRVM_GetString(prog, def->s_name));
//i = strlen(line);
//for ( ; i<20 ; i++)
*/
// LordHavoc: optimized this to print out much more quickly (tempstring)
// LordHavoc: changed to print out every 4096 characters (incase there are a lot of fields to print)
-void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname)
+void PRVM_ED_Print(prvm_prog_t *prog, prvm_edict_t *ed, const char *wildcard_fieldname)
{
size_t l;
ddef_t *d;
const char *name;
int type;
char tempstring[MAX_INPUTLINE], tempstring2[260]; // temporary string buffers
+ char valuebuf[MAX_INPUTLINE];
if (ed->priv.required->free)
{
- Con_Printf("%s: FREE\n",PRVM_NAME);
+ Con_Printf("%s: FREE\n",prog->name);
return;
}
tempstring[0] = 0;
- dpsnprintf(tempstring, sizeof(tempstring), "\n%s EDICT %i:\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ed));
- for (i=1 ; i<prog->progs->numfielddefs ; i++)
+ dpsnprintf(tempstring, sizeof(tempstring), "\n%s EDICT %i:\n", prog->name, PRVM_NUM_FOR_EDICT(ed));
+ for (i = 1;i < prog->numfielddefs;i++)
{
d = &prog->fielddefs[i];
- name = PRVM_GetString(d->s_name);
- if (name[strlen(name)-2] == '_')
+ name = PRVM_GetString(prog, d->s_name);
+ if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z'))
continue; // skip _x, _y, _z vars
// Check Field Name Wildcard
strlcat(tempstring, " ", sizeof(tempstring));
strlcat(tempstring, " ", sizeof(tempstring));
- name = PRVM_ValueString((etype_t)d->type, (prvm_eval_t *)v);
+ name = PRVM_ValueString(prog, (etype_t)d->type, (prvm_eval_t *)v, valuebuf, sizeof(valuebuf));
if (strlen(name) > sizeof(tempstring2)-4)
{
memcpy (tempstring2, name, sizeof(tempstring2)-4);
=============
*/
extern cvar_t developer_entityparsing;
-void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
+void PRVM_ED_Write (prvm_prog_t *prog, qfile_t *f, prvm_edict_t *ed)
{
ddef_t *d;
int *v;
int i, j;
const char *name;
int type;
+ char vabuf[1024];
+ char valuebuf[MAX_INPUTLINE];
FS_Print(f, "{\n");
return;
}
- for (i=1 ; i<prog->progs->numfielddefs ; i++)
+ for (i = 1;i < prog->numfielddefs;i++)
{
d = &prog->fielddefs[i];
- name = PRVM_GetString(d->s_name);
+ name = PRVM_GetString(prog, 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
+ //if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z'))
+ if(strlen(name) > 1 && name[strlen(name)-2] == '_')
+ continue; // skip _x, _y, _z vars, and ALSO other _? vars as some mods expect them to be never saved (TODO: a gameplayfix for using the "more precise" condition above?)
v = (int *)(ed->fields.vp + d->ofs);
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 = va(vabuf, sizeof(vabuf), "PRVM_ED_Write, ent=%d, name=%s", i, name);
+ FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(prog, (etype_t)d->type, (prvm_eval_t *)v, valuebuf, sizeof(valuebuf)));
prog->statestring = NULL;
}
FS_Print(f, "}\n");
}
-void PRVM_ED_PrintNum (int ent, const char *wildcard_fieldname)
+void PRVM_ED_PrintNum (prvm_prog_t *prog, int ent, const char *wildcard_fieldname)
{
- PRVM_ED_Print(PRVM_EDICT_NUM(ent), wildcard_fieldname);
+ PRVM_ED_Print(prog, PRVM_EDICT_NUM(ent), wildcard_fieldname);
}
/*
*/
void PRVM_ED_PrintEdicts_f (void)
{
+ prvm_prog_t *prog;
int i;
const char *wildcard_fieldname;
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
if( Cmd_Argc() == 3)
else
wildcard_fieldname = NULL;
- Con_Printf("%s: %i entities\n", PRVM_NAME, prog->num_edicts);
+ Con_Printf("%s: %i entities\n", prog->name, prog->num_edicts);
for (i=0 ; i<prog->num_edicts ; i++)
- PRVM_ED_PrintNum (i, wildcard_fieldname);
-
- PRVM_End;
+ PRVM_ED_PrintNum (prog, i, wildcard_fieldname);
}
/*
For debugging, prints a single edict
=============
*/
-void PRVM_ED_PrintEdict_f (void)
+static void PRVM_ED_PrintEdict_f (void)
{
+ prvm_prog_t *prog;
int i;
const char *wildcard_fieldname;
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
i = atoi (Cmd_Argv(2));
if (i >= prog->num_edicts)
{
Con_Print("Bad edict number\n");
- PRVM_End;
return;
}
if( Cmd_Argc() == 4)
else
// Use All
wildcard_fieldname = NULL;
- PRVM_ED_PrintNum (i, wildcard_fieldname);
-
- PRVM_End;
+ PRVM_ED_PrintNum (prog, i, wildcard_fieldname);
}
/*
*/
// 2 possibilities : 1. just displaying the active edict count
// 2. making a function pointer [x]
-void PRVM_ED_Count_f (void)
+static void PRVM_ED_Count_f (void)
{
- int i;
- prvm_edict_t *ent;
- int active;
+ prvm_prog_t *prog;
if(Cmd_Argc() != 2)
{
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- if(prog->count_edicts)
- prog->count_edicts();
- else
- {
- active = 0;
- for (i=0 ; i<prog->num_edicts ; i++)
- {
- ent = PRVM_EDICT_NUM(i);
- if (ent->priv.required->free)
- continue;
- active++;
- }
-
- Con_Printf("num_edicts:%3i\n", prog->num_edicts);
- Con_Printf("active :%3i\n", active);
- }
-
- PRVM_End;
+ prog->count_edicts(prog);
}
/*
PRVM_ED_WriteGlobals
=============
*/
-void PRVM_ED_WriteGlobals (qfile_t *f)
+void PRVM_ED_WriteGlobals (prvm_prog_t *prog, qfile_t *f)
{
ddef_t *def;
int i;
const char *name;
int type;
+ char vabuf[1024];
+ char valuebuf[MAX_INPUTLINE];
FS_Print(f,"{\n");
- for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ for (i = 0;i < prog->numglobaldefs;i++)
{
def = &prog->globaldefs[i];
type = def->type;
if (type != ev_string && type != ev_float && type != ev_entity)
continue;
- name = PRVM_GetString(def->s_name);
+ name = PRVM_GetString(prog, 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);
+ prog->statestring = va(vabuf, sizeof(vabuf), "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]));
+ FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(prog, (etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs], valuebuf, sizeof(valuebuf)));
prog->statestring = NULL;
}
FS_Print(f,"}\n");
PRVM_ED_ParseGlobals
=============
*/
-void PRVM_ED_ParseGlobals (const char *data)
+void PRVM_ED_ParseGlobals (prvm_prog_t *prog, const char *data)
{
char keyname[MAX_INPUTLINE];
ddef_t *key;
while (1)
{
// parse key
- if (!COM_ParseToken_Simple(&data, false, false))
- PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
+ if (!COM_ParseToken_Simple(&data, false, false, true))
+ prog->error_cmd("PRVM_ED_ParseGlobals: EOF without closing brace");
if (com_token[0] == '}')
break;
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 (!COM_ParseToken_Simple(&data, false, true, true))
+ prog->error_cmd("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");
+ prog->error_cmd("PRVM_ED_ParseGlobals: closing brace without data");
- key = PRVM_ED_FindGlobal (keyname);
+ key = PRVM_ED_FindGlobal (prog, keyname);
if (!key)
{
- Con_DPrintf("'%s' is not a global on %s\n", keyname, PRVM_NAME);
+ Con_DPrintf("'%s' is not a global on %s\n", keyname, prog->name);
continue;
}
- if (!PRVM_ED_ParseEpair(NULL, key, com_token, true))
- PRVM_ERROR ("PRVM_ED_ParseGlobals: parse error");
+ if (!PRVM_ED_ParseEpair(prog, NULL, key, com_token, true))
+ prog->error_cmd("PRVM_ED_ParseGlobals: parse error");
}
}
returns false if error
=============
*/
-qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash)
+qboolean PRVM_ED_ParseEpair(prvm_prog_t *prog, prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash)
{
int i, l;
char *new_p;
{
case ev_string:
l = (int)strlen(s) + 1;
- val->string = PRVM_AllocString(l, &new_p);
+ val->string = PRVM_AllocString(prog, l, &new_p);
for (i = 0;i < l;i++)
{
if (s[i] == '\\' && s[i+1] && parsebackslash)
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, prog->limit_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, prog->name);
while (i >= prog->max_edicts)
- PRVM_MEM_IncreaseEdicts();
+ PRVM_MEM_IncreaseEdicts(prog);
// if IncreaseEdicts was called the base pointer needs to be updated
if (ent)
val = (prvm_eval_t *)(ent->fields.vp + key->ofs);
case ev_field:
if (*s != '.')
{
- Con_DPrintf("PRVM_ED_ParseEpair: Bogus field name %s in %s\n", s, PRVM_NAME);
+ Con_DPrintf("PRVM_ED_ParseEpair: Bogus field name %s in %s\n", s, prog->name);
return false;
}
- def = PRVM_ED_FindField(s + 1);
+ def = PRVM_ED_FindField(prog, s + 1);
if (!def)
{
- Con_DPrintf("PRVM_ED_ParseEpair: Can't find field %s in %s\n", s, PRVM_NAME);
+ Con_DPrintf("PRVM_ED_ParseEpair: Can't find field %s in %s\n", s, prog->name);
return false;
}
val->_int = def->ofs;
break;
case ev_function:
- func = PRVM_ED_FindFunction(s);
+ func = PRVM_ED_FindFunction(prog, s);
if (!func)
{
- Con_Printf("PRVM_ED_ParseEpair: Can't find function %s in %s\n", s, PRVM_NAME);
+ Con_Printf("PRVM_ED_ParseEpair: Can't find function %s in %s\n", s, prog->name);
return false;
}
val->function = func - prog->functions;
break;
default:
- Con_Printf("PRVM_ED_ParseEpair: Unknown key->type %i for key \"%s\" on %s\n", key->type, PRVM_GetString(key->s_name), PRVM_NAME);
+ Con_Printf("PRVM_ED_ParseEpair: Unknown key->type %i for key \"%s\" on %s\n", key->type, PRVM_GetString(prog, key->s_name), prog->name);
return false;
}
return true;
QC, mg in menu QC.
=============
*/
-void PRVM_GameCommand(const char *whichprogs, const char *whichcmd)
+static void PRVM_GameCommand(const char *whichprogs, const char *whichcmd)
{
+ prvm_prog_t *prog;
if(Cmd_Argc() < 1)
{
Con_Printf("%s text...\n", whichcmd);
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(whichprogs))
- // note: this is not PRVM_SetProg because that one aborts "hard" using PRVM_Error
- // also, it makes printing error messages easier!
- {
- Con_Printf("%s program not loaded.\n", whichprogs);
+ if (!(prog = PRVM_FriendlyProgFromString(whichprogs)))
return;
- }
- if(!prog->funcoffsets.GameCommand)
+ if(!PRVM_allfunction(GameCommand))
{
Con_Printf("%s program do not support GameCommand!\n", whichprogs);
}
s = Cmd_Args();
- restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
- PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(s ? s : "");
- PRVM_ExecuteProgram (prog->funcoffsets.GameCommand, "QC function GameCommand is missing");
- vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+ restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
+ PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, s ? s : "");
+ prog->ExecuteProgram(prog, PRVM_allfunction(GameCommand), "QC function GameCommand is missing");
+ prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
}
-
- PRVM_End;
}
-void PRVM_GameCommand_Server_f(void)
+static void PRVM_GameCommand_Server_f(void)
{
PRVM_GameCommand("server", "sv_cmd");
}
-void PRVM_GameCommand_Client_f(void)
+static void PRVM_GameCommand_Client_f(void)
{
PRVM_GameCommand("client", "cl_cmd");
}
-void PRVM_GameCommand_Menu_f(void)
+static void PRVM_GameCommand_Menu_f(void)
{
PRVM_GameCommand("menu", "menu_cmd");
}
Console command to load a field of a specified edict
=============
*/
-void PRVM_ED_EdictGet_f(void)
+static void PRVM_ED_EdictGet_f(void)
{
+ prvm_prog_t *prog;
prvm_edict_t *ed;
ddef_t *key;
const char *s;
prvm_eval_t *v;
+ char valuebuf[MAX_INPUTLINE];
if(Cmd_Argc() != 4 && Cmd_Argc() != 5)
{
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
- {
- Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- }
ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(2)));
- if((key = PRVM_ED_FindField(Cmd_Argv(3))) == 0)
+ if((key = PRVM_ED_FindField(prog, 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);
+ s = PRVM_UglyValueString(prog, (etype_t)key->type, v, valuebuf, sizeof(valuebuf));
if(Cmd_Argc() == 5)
{
cvar_t *cvar = Cvar_FindVar(Cmd_Argv(4));
Con_Printf("%s\n", s);
fail:
- PRVM_End;
+ ;
}
-void PRVM_ED_GlobalGet_f(void)
+static void PRVM_ED_GlobalGet_f(void)
{
+ prvm_prog_t *prog;
ddef_t *key;
const char *s;
prvm_eval_t *v;
+ char valuebuf[MAX_INPUTLINE];
if(Cmd_Argc() != 3 && Cmd_Argc() != 4)
{
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
- {
- Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- }
- key = PRVM_ED_FindGlobal(Cmd_Argv(2));
+ key = PRVM_ED_FindGlobal(prog, Cmd_Argv(2));
if(!key)
{
Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) );
}
v = (prvm_eval_t *) &prog->globals.generic[key->ofs];
- s = PRVM_UglyValueString(key->type, v);
+ s = PRVM_UglyValueString(prog, (etype_t)key->type, v, valuebuf, sizeof(valuebuf));
if(Cmd_Argc() == 4)
{
cvar_t *cvar = Cvar_FindVar(Cmd_Argv(3));
Con_Printf("%s\n", s);
fail:
- PRVM_End;
+ ;
}
/*
Console command to set a field of a specified edict
=============
*/
-void PRVM_ED_EdictSet_f(void)
+static void PRVM_ED_EdictSet_f(void)
{
+ prvm_prog_t *prog;
prvm_edict_t *ed;
ddef_t *key;
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
- {
- Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- }
ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(2)));
- if((key = PRVM_ED_FindField(Cmd_Argv(3))) == 0)
+ if((key = PRVM_ED_FindField(prog, Cmd_Argv(3))) == 0)
Con_Printf("Key %s not found !\n", Cmd_Argv(3));
else
- PRVM_ED_ParseEpair(ed, key, Cmd_Argv(4), true);
-
- PRVM_End;
+ PRVM_ED_ParseEpair(prog, ed, key, Cmd_Argv(4), true);
}
/*
Used for initial level load and for savegames.
====================
*/
-const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
+const char *PRVM_ED_ParseEdict (prvm_prog_t *prog, const char *data, prvm_edict_t *ent)
{
ddef_t *key;
qboolean anglehack;
while (1)
{
// parse key
- if (!COM_ParseToken_Simple(&data, false, false))
- PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
+ if (!COM_ParseToken_Simple(&data, false, false, true))
+ prog->error_cmd("PRVM_ED_ParseEdict: EOF without closing brace");
if (developer_entityparsing.integer)
Con_Printf("Key: \"%s\"", com_token);
if (com_token[0] == '}')
}
// parse value
- if (!COM_ParseToken_Simple(&data, false, false))
- PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
+ if (!COM_ParseToken_Simple(&data, false, false, true))
+ prog->error_cmd("PRVM_ED_ParseEdict: EOF without closing brace");
if (developer_entityparsing.integer)
Con_Printf(" \"%s\"\n", com_token);
if (com_token[0] == '}')
- PRVM_ERROR ("PRVM_ED_ParseEdict: closing brace without data");
+ prog->error_cmd("PRVM_ED_ParseEdict: closing brace without data");
init = true;
if (keyname[0] == '_')
continue;
- key = PRVM_ED_FindField (keyname);
+ key = PRVM_ED_FindField (prog, keyname);
if (!key)
{
- Con_DPrintf("%s: '%s' is not a field\n", PRVM_NAME, keyname);
+ Con_DPrintf("%s: '%s' is not a field\n", prog->name, keyname);
continue;
}
dpsnprintf (com_token, sizeof(com_token), "0 %s 0", temp);
}
- if (!PRVM_ED_ParseEpair(ent, key, com_token, strcmp(keyname, "wad") != 0))
- PRVM_ERROR ("PRVM_ED_ParseEdict: parse error");
+ if (!PRVM_ED_ParseEpair(prog, ent, key, com_token, strcmp(keyname, "wad") != 0))
+ prog->error_cmd("PRVM_ED_ParseEdict: parse error");
}
if (!init)
to call PRVM_ED_CallSpawnFunctions () to let the objects initialize themselves.
================
*/
-void PRVM_ED_LoadFromFile (const char *data)
+void PRVM_ED_LoadFromFile (prvm_prog_t *prog, const char *data)
{
prvm_edict_t *ent;
int parsed, inhibited, spawned, died;
const char *funcname;
mfunction_t *func;
+ char vabuf[1024];
parsed = 0;
inhibited = 0;
spawned = 0;
died = 0;
+ prvm_reuseedicts_always_allow = realtime;
// parse ents
while (1)
{
// parse the opening brace
- if (!COM_ParseToken_Simple(&data, false, false))
+ if (!COM_ParseToken_Simple(&data, false, false, true))
break;
if (com_token[0] != '{')
- PRVM_ERROR ("PRVM_ED_LoadFromFile: %s: found %s when expecting {", PRVM_NAME, com_token);
+ prog->error_cmd("PRVM_ED_LoadFromFile: %s: found %s when expecting {", prog->name, com_token);
// CHANGED: this is not conform to PR_LoadFromFile
if(prog->loadintoworld)
ent = PRVM_EDICT_NUM(0);
}
else
- ent = PRVM_ED_Alloc();
+ ent = PRVM_ED_Alloc(prog);
// clear it
if (ent != prog->edicts) // hack
- memset (ent->fields.vp, 0, prog->progs->entityfields * 4);
+ memset (ent->fields.vp, 0, prog->entityfields * 4);
- data = PRVM_ED_ParseEdict (data, ent);
+ data = PRVM_ED_ParseEdict (prog, data, ent);
parsed++;
// remove the entity ?
- if(prog->load_edict && !prog->load_edict(ent))
+ if(!prog->load_edict(prog, ent))
{
- PRVM_ED_Free(ent);
+ PRVM_ED_Free(prog, ent);
inhibited++;
continue;
}
- if (prog->funcoffsets.SV_OnEntityPreSpawnFunction)
+ if (PRVM_serverfunction(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");
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPreSpawnFunction), "QC function SV_OnEntityPreSpawnFunction is missing");
}
if(ent->priv.required->free)
// 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;
- if (!handle)
+ if (!PRVM_alledictstring(ent, classname))
{
Con_Print("No classname for:\n");
- PRVM_ED_Print(ent, NULL);
- PRVM_ED_Free (ent);
+ PRVM_ED_Print(prog, ent, NULL);
+ PRVM_ED_Free (prog, ent);
continue;
}
// look for the spawn function
- funcname = PRVM_GetString(handle);
- func = PRVM_ED_FindFunction (va("spawnfunc_%s", funcname));
+ funcname = PRVM_GetString(prog, PRVM_alledictstring(ent, classname));
+ func = PRVM_ED_FindFunction (prog, va(vabuf, sizeof(vabuf), "spawnfunc_%s", funcname));
if(!func)
- if(prog->globaloffsets.require_spawnfunc_prefix < 0)
- func = PRVM_ED_FindFunction (funcname);
+ if(!PRVM_allglobalfloat(require_spawnfunc_prefix))
+ func = PRVM_ED_FindFunction (prog, funcname);
if (!func)
{
// check for OnEntityNoSpawnFunction
- if (prog->funcoffsets.SV_OnEntityNoSpawnFunction)
+ if (PRVM_serverfunction(SV_OnEntityNoSpawnFunction))
{
// self = ent
- PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
- PRVM_ExecuteProgram (prog->funcoffsets.SV_OnEntityNoSpawnFunction, "QC function SV_OnEntityNoSpawnFunction is missing");
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityNoSpawnFunction), "QC function SV_OnEntityNoSpawnFunction is missing");
}
else
{
- if (developer.integer) // don't confuse non-developers with errors
+ if (developer.integer > 0) // don't confuse non-developers with errors
{
Con_Print("No spawn function for:\n");
- PRVM_ED_Print(ent, NULL);
+ PRVM_ED_Print(prog, ent, NULL);
}
- PRVM_ED_Free (ent);
+ PRVM_ED_Free (prog, ent);
continue; // not included in "inhibited" count
}
}
else
{
// self = ent
- PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
- PRVM_ExecuteProgram (func - prog->functions, "");
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_allglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, func - prog->functions, "");
}
}
if(!ent->priv.required->free)
- if (prog->funcoffsets.SV_OnEntityPostSpawnFunction)
+ if (PRVM_serverfunction(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");
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPostSpawnFunction), "QC function SV_OnEntityPostSpawnFunction is missing");
}
spawned++;
died++;
}
- Con_DPrintf("%s: %i new entities parsed, %i new inhibited, %i (%i new) spawned (whereas %i removed self, %i stayed)\n", PRVM_NAME, parsed, inhibited, prog->num_edicts, spawned, died, spawned - died);
+ Con_DPrintf("%s: %i new entities parsed, %i new inhibited, %i (%i new) spawned (whereas %i removed self, %i stayed)\n", prog->name, parsed, inhibited, prog->num_edicts, spawned, died, spawned - died);
+
+ prvm_reuseedicts_always_allow = 0;
}
-void PRVM_FindOffsets(void)
+static void PRVM_FindOffsets(prvm_prog_t *prog)
{
// field and global searches use -1 for NULL
memset(&prog->fieldoffsets, -1, sizeof(prog->fieldoffsets));
memset(&prog->globaloffsets, -1, sizeof(prog->globaloffsets));
- // functions use 0 for NULL
+ // function searches use 0 for NULL
memset(&prog->funcoffsets, 0, sizeof(prog->funcoffsets));
-
- // 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.ammo_lava_nails = PRVM_ED_FindFieldOffset("ammo_lava_nails");
- prog->fieldoffsets.ammo_multi_rockets = PRVM_ED_FindFieldOffset("ammo_multi_rockets");
- prog->fieldoffsets.ammo_nails1 = PRVM_ED_FindFieldOffset("ammo_nails1");
- prog->fieldoffsets.ammo_plasma = PRVM_ED_FindFieldOffset("ammo_plasma");
- prog->fieldoffsets.ammo_rockets1 = PRVM_ED_FindFieldOffset("ammo_rockets1");
- prog->fieldoffsets.ammo_shells1 = PRVM_ED_FindFieldOffset("ammo_shells1");
- prog->fieldoffsets.angles = PRVM_ED_FindFieldOffset("angles");
- prog->fieldoffsets.button3 = PRVM_ED_FindFieldOffset("button3");
- prog->fieldoffsets.button4 = PRVM_ED_FindFieldOffset("button4");
- prog->fieldoffsets.button5 = PRVM_ED_FindFieldOffset("button5");
- prog->fieldoffsets.button6 = PRVM_ED_FindFieldOffset("button6");
- prog->fieldoffsets.button7 = PRVM_ED_FindFieldOffset("button7");
- prog->fieldoffsets.button8 = PRVM_ED_FindFieldOffset("button8");
- prog->fieldoffsets.button9 = PRVM_ED_FindFieldOffset("button9");
- prog->fieldoffsets.button10 = PRVM_ED_FindFieldOffset("button10");
- prog->fieldoffsets.button11 = PRVM_ED_FindFieldOffset("button11");
- prog->fieldoffsets.button12 = PRVM_ED_FindFieldOffset("button12");
- prog->fieldoffsets.button13 = PRVM_ED_FindFieldOffset("button13");
- prog->fieldoffsets.button14 = PRVM_ED_FindFieldOffset("button14");
- prog->fieldoffsets.button15 = PRVM_ED_FindFieldOffset("button15");
- prog->fieldoffsets.button16 = PRVM_ED_FindFieldOffset("button16");
- prog->fieldoffsets.buttonchat = PRVM_ED_FindFieldOffset("buttonchat");
- 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.cursor_active = PRVM_ED_FindFieldOffset("cursor_active");
- prog->fieldoffsets.cursor_screen = PRVM_ED_FindFieldOffset("cursor_screen");
- prog->fieldoffsets.cursor_trace_endpos = PRVM_ED_FindFieldOffset("cursor_trace_endpos");
- prog->fieldoffsets.cursor_trace_ent = PRVM_ED_FindFieldOffset("cursor_trace_ent");
- prog->fieldoffsets.cursor_trace_start = PRVM_ED_FindFieldOffset("cursor_trace_start");
- prog->fieldoffsets.customizeentityforclient = PRVM_ED_FindFieldOffset("customizeentityforclient");
- prog->fieldoffsets.dimension_hit = PRVM_ED_FindFieldOffset("dimension_hit");
- prog->fieldoffsets.dimension_solid = PRVM_ED_FindFieldOffset("dimension_solid");
- prog->fieldoffsets.disableclientprediction = PRVM_ED_FindFieldOffset("disableclientprediction");
- prog->fieldoffsets.dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask");
- prog->fieldoffsets.drawonlytoclient = PRVM_ED_FindFieldOffset("drawonlytoclient");
- prog->fieldoffsets.exteriormodeltoclient = PRVM_ED_FindFieldOffset("exteriormodeltoclient");
- prog->fieldoffsets.fatness = PRVM_ED_FindFieldOffset("fatness");
- prog->fieldoffsets.forceshader = PRVM_ED_FindFieldOffset("forceshader");
- prog->fieldoffsets.frame = PRVM_ED_FindFieldOffset("frame");
- 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.ideal_yaw = PRVM_ED_FindFieldOffset("ideal_yaw");
- 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.movement = PRVM_ED_FindFieldOffset("movement");
- prog->fieldoffsets.movetypesteplandevent = PRVM_ED_FindFieldOffset("movetypesteplandevent");
- prog->fieldoffsets.netaddress = PRVM_ED_FindFieldOffset("netaddress");
- prog->fieldoffsets.nextthink = PRVM_ED_FindFieldOffset("nextthink");
- prog->fieldoffsets.nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient");
- prog->fieldoffsets.pflags = PRVM_ED_FindFieldOffset("pflags");
- prog->fieldoffsets.ping = PRVM_ED_FindFieldOffset("ping");
- prog->fieldoffsets.pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed");
- prog->fieldoffsets.playermodel = PRVM_ED_FindFieldOffset("playermodel");
- prog->fieldoffsets.playerskin = PRVM_ED_FindFieldOffset("playerskin");
- prog->fieldoffsets.pmodel = PRVM_ED_FindFieldOffset("pmodel");
- prog->fieldoffsets.punchvector = PRVM_ED_FindFieldOffset("punchvector");
- prog->fieldoffsets.renderamt = PRVM_ED_FindFieldOffset("renderamt"); // HalfLife support
- 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.think = PRVM_ED_FindFieldOffset("think");
- 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.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_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_InputEvent = PRVM_ED_FindFunctionOffset("CSQC_InputEvent");
- prog->funcoffsets.CSQC_Parse_CenterPrint = PRVM_ED_FindFunctionOffset("CSQC_Parse_CenterPrint");
- prog->funcoffsets.CSQC_Parse_Print = PRVM_ED_FindFunctionOffset("CSQC_Parse_Print");
- prog->funcoffsets.CSQC_Parse_StuffCmd = PRVM_ED_FindFunctionOffset("CSQC_Parse_StuffCmd");
- 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.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_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.trace_allsolid = PRVM_ED_FindGlobalOffset("trace_allsolid");
- 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.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");
- prog->funcoffsets.m_init = PRVM_ED_FindFunctionOffset("m_init");
- prog->funcoffsets.m_keydown = PRVM_ED_FindFunctionOffset("m_keydown");
- prog->funcoffsets.m_keyup = PRVM_ED_FindFunctionOffset("m_keyup");
- prog->funcoffsets.m_shutdown = PRVM_ED_FindFunctionOffset("m_shutdown");
- prog->funcoffsets.m_toggle = PRVM_ED_FindFunctionOffset("m_toggle");
+#define PRVM_DECLARE_serverglobalfloat(x)
+#define PRVM_DECLARE_serverglobalvector(x)
+#define PRVM_DECLARE_serverglobalstring(x)
+#define PRVM_DECLARE_serverglobaledict(x)
+#define PRVM_DECLARE_serverglobalfunction(x)
+#define PRVM_DECLARE_clientglobalfloat(x)
+#define PRVM_DECLARE_clientglobalvector(x)
+#define PRVM_DECLARE_clientglobalstring(x)
+#define PRVM_DECLARE_clientglobaledict(x)
+#define PRVM_DECLARE_clientglobalfunction(x)
+#define PRVM_DECLARE_menuglobalfloat(x)
+#define PRVM_DECLARE_menuglobalvector(x)
+#define PRVM_DECLARE_menuglobalstring(x)
+#define PRVM_DECLARE_menuglobaledict(x)
+#define PRVM_DECLARE_menuglobalfunction(x)
+#define PRVM_DECLARE_serverfieldfloat(x)
+#define PRVM_DECLARE_serverfieldvector(x)
+#define PRVM_DECLARE_serverfieldstring(x)
+#define PRVM_DECLARE_serverfieldedict(x)
+#define PRVM_DECLARE_serverfieldfunction(x)
+#define PRVM_DECLARE_clientfieldfloat(x)
+#define PRVM_DECLARE_clientfieldvector(x)
+#define PRVM_DECLARE_clientfieldstring(x)
+#define PRVM_DECLARE_clientfieldedict(x)
+#define PRVM_DECLARE_clientfieldfunction(x)
+#define PRVM_DECLARE_menufieldfloat(x)
+#define PRVM_DECLARE_menufieldvector(x)
+#define PRVM_DECLARE_menufieldstring(x)
+#define PRVM_DECLARE_menufieldedict(x)
+#define PRVM_DECLARE_menufieldfunction(x)
+#define PRVM_DECLARE_serverfunction(x)
+#define PRVM_DECLARE_clientfunction(x)
+#define PRVM_DECLARE_menufunction(x)
+#define PRVM_DECLARE_field(x) prog->fieldoffsets.x = PRVM_ED_FindFieldOffset(prog, #x);
+#define PRVM_DECLARE_global(x) prog->globaloffsets.x = PRVM_ED_FindGlobalOffset(prog, #x);
+#define PRVM_DECLARE_function(x) prog->funcoffsets.x = PRVM_ED_FindFunctionOffset(prog, #x);
+#include "prvm_offsets.h"
+#undef PRVM_DECLARE_serverglobalfloat
+#undef PRVM_DECLARE_serverglobalvector
+#undef PRVM_DECLARE_serverglobalstring
+#undef PRVM_DECLARE_serverglobaledict
+#undef PRVM_DECLARE_serverglobalfunction
+#undef PRVM_DECLARE_clientglobalfloat
+#undef PRVM_DECLARE_clientglobalvector
+#undef PRVM_DECLARE_clientglobalstring
+#undef PRVM_DECLARE_clientglobaledict
+#undef PRVM_DECLARE_clientglobalfunction
+#undef PRVM_DECLARE_menuglobalfloat
+#undef PRVM_DECLARE_menuglobalvector
+#undef PRVM_DECLARE_menuglobalstring
+#undef PRVM_DECLARE_menuglobaledict
+#undef PRVM_DECLARE_menuglobalfunction
+#undef PRVM_DECLARE_serverfieldfloat
+#undef PRVM_DECLARE_serverfieldvector
+#undef PRVM_DECLARE_serverfieldstring
+#undef PRVM_DECLARE_serverfieldedict
+#undef PRVM_DECLARE_serverfieldfunction
+#undef PRVM_DECLARE_clientfieldfloat
+#undef PRVM_DECLARE_clientfieldvector
+#undef PRVM_DECLARE_clientfieldstring
+#undef PRVM_DECLARE_clientfieldedict
+#undef PRVM_DECLARE_clientfieldfunction
+#undef PRVM_DECLARE_menufieldfloat
+#undef PRVM_DECLARE_menufieldvector
+#undef PRVM_DECLARE_menufieldstring
+#undef PRVM_DECLARE_menufieldedict
+#undef PRVM_DECLARE_menufieldfunction
+#undef PRVM_DECLARE_serverfunction
+#undef PRVM_DECLARE_clientfunction
+#undef PRVM_DECLARE_menufunction
+#undef PRVM_DECLARE_field
+#undef PRVM_DECLARE_global
+#undef PRVM_DECLARE_function
}
// not used
===============
*/
-void PRVM_LeakTest(void);
-void PRVM_ResetProg(void)
+#define PO_HASHSIZE 16384
+typedef struct po_string_s
+{
+ char *key, *value;
+ struct po_string_s *nextonhashchain;
+}
+po_string_t;
+typedef struct po_s
+{
+ po_string_t *hashtable[PO_HASHSIZE];
+}
+po_t;
+static void PRVM_PO_UnparseString(char *out, const char *in, size_t outsize)
+{
+ for(;;)
+ {
+ switch(*in)
+ {
+ case 0:
+ *out++ = 0;
+ return;
+ case '\a': if(outsize >= 2) { *out++ = '\\'; *out++ = 'a'; outsize -= 2; } break;
+ case '\b': if(outsize >= 2) { *out++ = '\\'; *out++ = 'b'; outsize -= 2; } break;
+ case '\t': if(outsize >= 2) { *out++ = '\\'; *out++ = 't'; outsize -= 2; } break;
+ case '\r': if(outsize >= 2) { *out++ = '\\'; *out++ = 'r'; outsize -= 2; } break;
+ case '\n': if(outsize >= 2) { *out++ = '\\'; *out++ = 'n'; outsize -= 2; } break;
+ case '\\': if(outsize >= 2) { *out++ = '\\'; *out++ = '\\'; outsize -= 2; } break;
+ case '"': if(outsize >= 2) { *out++ = '\\'; *out++ = '"'; outsize -= 2; } break;
+ default:
+ if(*in >= 0 && *in <= 0x1F)
+ {
+ if(outsize >= 4)
+ {
+ *out++ = '\\';
+ *out++ = '0' + ((*in & 0700) >> 6);
+ *out++ = '0' + ((*in & 0070) >> 3);
+ *out++ = '0' + ((*in & 0007));
+ outsize -= 4;
+ }
+ }
+ else
+ {
+ if(outsize >= 1)
+ {
+ *out++ = *in;
+ outsize -= 1;
+ }
+ }
+ break;
+ }
+ ++in;
+ }
+}
+static void PRVM_PO_ParseString(char *out, const char *in, size_t outsize)
+{
+ for(;;)
+ {
+ switch(*in)
+ {
+ case 0:
+ *out++ = 0;
+ return;
+ case '\\':
+ ++in;
+ switch(*in)
+ {
+ case 'a': if(outsize > 0) { *out++ = '\a'; --outsize; } break;
+ case 'b': if(outsize > 0) { *out++ = '\b'; --outsize; } break;
+ case 't': if(outsize > 0) { *out++ = '\t'; --outsize; } break;
+ case 'r': if(outsize > 0) { *out++ = '\r'; --outsize; } break;
+ case 'n': if(outsize > 0) { *out++ = '\n'; --outsize; } break;
+ case '\\': if(outsize > 0) { *out++ = '\\'; --outsize; } break;
+ case '"': if(outsize > 0) { *out++ = '"'; --outsize; } break;
+ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7':
+ if(outsize > 0)
+ *out = *in - '0';
+ ++in;
+ if(*in >= '0' && *in <= '7')
+ {
+ if(outsize > 0)
+ *out = (*out << 3) | (*in - '0');
+ ++in;
+ }
+ if(*in >= '0' && *in <= '7')
+ {
+ if(outsize > 0)
+ *out = (*out << 3) | (*in - '0');
+ ++in;
+ }
+ --in;
+ if(outsize > 0)
+ {
+ ++out;
+ --outsize;
+ }
+ break;
+ default:
+ if(outsize > 0) { *out++ = *in; --outsize; }
+ break;
+ }
+ break;
+ default:
+ if(outsize > 0)
+ {
+ *out++ = *in;
+ --outsize;
+ }
+ break;
+ }
+ ++in;
+ }
+}
+static po_t *PRVM_PO_Load(const char *filename, mempool_t *pool)
+{
+ po_t *po;
+ const char *p, *q;
+ int mode;
+ char inbuf[MAX_INPUTLINE];
+ char decodedbuf[MAX_INPUTLINE];
+ size_t decodedpos;
+ int hashindex;
+ po_string_t thisstr;
+ const char *buf = (const char *) FS_LoadFile(filename, pool, true, NULL);
+
+ if(!buf)
+ return NULL;
+
+ memset(&thisstr, 0, sizeof(thisstr)); // hush compiler warning
+
+ po = (po_t *)Mem_Alloc(pool, sizeof(*po));
+ memset(po, 0, sizeof(*po));
+
+ p = buf;
+ while(*p)
+ {
+ if(*p == '#')
+ {
+ // skip to newline
+ p = strchr(p, '\n');
+ if(!p)
+ break;
+ ++p;
+ continue;
+ }
+ if(*p == '\r' || *p == '\n')
+ {
+ ++p;
+ continue;
+ }
+ if(!strncmp(p, "msgid \"", 7))
+ {
+ mode = 0;
+ p += 6;
+ }
+ else if(!strncmp(p, "msgstr \"", 8))
+ {
+ mode = 1;
+ p += 7;
+ }
+ else
+ {
+ p = strchr(p, '\n');
+ if(!p)
+ break;
+ ++p;
+ continue;
+ }
+ decodedpos = 0;
+ while(*p == '"')
+ {
+ ++p;
+ q = strchr(p, '\n');
+ if(!q)
+ break;
+ if(*(q-1) == '\r')
+ --q;
+ if(*(q-1) != '"')
+ break;
+ if((size_t)(q - p) >= (size_t) sizeof(inbuf))
+ break;
+ strlcpy(inbuf, p, q - p); // not - 1, because this adds a NUL
+ PRVM_PO_ParseString(decodedbuf + decodedpos, inbuf, sizeof(decodedbuf) - decodedpos);
+ decodedpos += strlen(decodedbuf + decodedpos);
+ if(*q == '\r')
+ ++q;
+ if(*q == '\n')
+ ++q;
+ p = q;
+ }
+ if(mode == 0)
+ {
+ if(thisstr.key)
+ Mem_Free(thisstr.key);
+ thisstr.key = (char *)Mem_Alloc(pool, decodedpos + 1);
+ memcpy(thisstr.key, decodedbuf, decodedpos + 1);
+ }
+ else if(decodedpos > 0 && thisstr.key) // skip empty translation results
+ {
+ thisstr.value = (char *)Mem_Alloc(pool, decodedpos + 1);
+ memcpy(thisstr.value, decodedbuf, decodedpos + 1);
+ hashindex = CRC_Block((const unsigned char *) thisstr.key, strlen(thisstr.key)) % PO_HASHSIZE;
+ thisstr.nextonhashchain = po->hashtable[hashindex];
+ po->hashtable[hashindex] = (po_string_t *)Mem_Alloc(pool, sizeof(thisstr));
+ memcpy(po->hashtable[hashindex], &thisstr, sizeof(thisstr));
+ memset(&thisstr, 0, sizeof(thisstr));
+ }
+ }
+
+ Mem_Free((char *) buf);
+ return po;
+}
+static const char *PRVM_PO_Lookup(po_t *po, const char *str)
+{
+ int hashindex = CRC_Block((const unsigned char *) str, strlen(str)) % PO_HASHSIZE;
+ po_string_t *p = po->hashtable[hashindex];
+ while(p)
+ {
+ if(!strcmp(str, p->key))
+ return p->value;
+ p = p->nextonhashchain;
+ }
+ return NULL;
+}
+static void PRVM_PO_Destroy(po_t *po)
+{
+ int i;
+ for(i = 0; i < PO_HASHSIZE; ++i)
+ {
+ po_string_t *p = po->hashtable[i];
+ while(p)
+ {
+ po_string_t *q = p;
+ p = p->nextonhashchain;
+ Mem_Free(q->key);
+ Mem_Free(q->value);
+ Mem_Free(q);
+ }
+ }
+ Mem_Free(po);
+}
+
+void PRVM_LeakTest(prvm_prog_t *prog);
+void PRVM_Prog_Reset(prvm_prog_t *prog)
{
- PRVM_LeakTest();
- PRVM_GCALL(reset_cmd)();
+ PRVM_LeakTest(prog);
+ prog->reset_cmd(prog);
Mem_FreePool(&prog->progs_mempool);
+ if(prog->po)
+ PRVM_PO_Destroy((po_t *) prog->po);
memset(prog,0,sizeof(prvm_prog_t));
- prog->starttime = Sys_DoubleTime();
}
/*
PRVM_LoadLNO
===============
*/
-void PRVM_LoadLNO( const char *progname ) {
+static void PRVM_LoadLNO( prvm_prog_t *prog, const char *progname ) {
fs_offset_t filesize;
unsigned char *lno;
unsigned int *header;
<Spike> SafeWrite (h, &numstatements, sizeof(int));
<Spike> SafeWrite (h, statement_linenums, numstatements*sizeof(int));
*/
- if( (unsigned) filesize < (6 + prog->progs->numstatements) * sizeof( int ) ) {
+ if ((unsigned int)filesize < (6 + prog->progs_numstatements) * sizeof(int))
+ {
Mem_Free(lno);
return;
}
header = (unsigned int *) lno;
if( header[ 0 ] == *(unsigned int *) "LNOF" &&
LittleLong( header[ 1 ] ) == 1 &&
- (unsigned int)LittleLong( header[ 2 ] ) == (unsigned int)prog->progs->numglobaldefs &&
- (unsigned int)LittleLong( header[ 3 ] ) == (unsigned int)prog->progs->numglobals &&
- (unsigned int)LittleLong( header[ 4 ] ) == (unsigned int)prog->progs->numfielddefs &&
- (unsigned int)LittleLong( header[ 5 ] ) == (unsigned int)prog->progs->numstatements )
+ (unsigned int)LittleLong( header[ 2 ] ) == (unsigned int)prog->progs_numglobaldefs &&
+ (unsigned int)LittleLong( header[ 3 ] ) == (unsigned int)prog->progs_numglobals &&
+ (unsigned int)LittleLong( header[ 4 ] ) == (unsigned int)prog->progs_numfielddefs &&
+ (unsigned int)LittleLong( header[ 5 ] ) == (unsigned int)prog->progs_numstatements )
{
- prog->statement_linenums = (int *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof( int ) );
- memcpy( prog->statement_linenums, (int *) lno + 6, prog->progs->numstatements * sizeof( int ) );
+ prog->statement_linenums = (int *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof( int ) );
+ memcpy( prog->statement_linenums, (int *) lno + 6, prog->progs_numstatements * sizeof( int ) );
}
Mem_Free( lno );
}
PRVM_LoadProgs
===============
*/
-void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global)
+void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, int numrequiredfunc, const char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, prvm_required_field_t *required_global)
{
int i;
- dstatement_t *st;
+ dprograms_t *dprograms;
+ dstatement_t *instatements;
ddef_t *infielddefs;
- dfunction_t *dfunctions;
+ ddef_t *inglobaldefs;
+ float *inglobals;
+ dfunction_t *infunctions;
+ char *instrings;
fs_offset_t filesize;
-
- if( prog->loaded ) {
- PRVM_ERROR ("PRVM_LoadProgs: there is already a %s program loaded!", PRVM_NAME );
- }
-
- 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);
+ int requiredglobalspace;
+ opcode_t op;
+ int a;
+ int b;
+ int c;
+ char vabuf[1024];
+
+ if (prog->loaded)
+ prog->error_cmd("PRVM_LoadProgs: there is already a %s program loaded!", prog->name );
+
+ Host_LockSession(); // all progs can use the session cvar
+ Crypto_LoadKeys(); // all progs might use the keys at init time
+
+ dprograms = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false, &filesize);
+ if (dprograms == NULL || filesize < (fs_offset_t)sizeof(dprograms_t))
+ prog->error_cmd("PRVM_LoadProgs: couldn't load %s for %s", filename, prog->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->profiletime = Sys_DirtyTime();
+ prog->starttime = realtime;
- prog->filecrc = CRC_Block((unsigned char *)prog->progs, filesize);
+ Con_DPrintf("%s programs occupy %iK.\n", prog->name, (int)(filesize/1024));
-// byte swap the header
- for (i = 0;i < (int) sizeof(*prog->progs) / 4;i++)
- ((int *)prog->progs)[i] = LittleLong ( ((int *)prog->progs)[i] );
+ requiredglobalspace = 0;
+ for (i = 0;i < numrequiredglobals;i++)
+ requiredglobalspace += required_global[i].type == ev_vector ? 3 : 1;
- if (prog->progs->version != PROG_VERSION)
- PRVM_ERROR ("%s: %s has wrong version number (%i should be %i)", PRVM_NAME, filename, prog->progs->version, PROG_VERSION);
- if (prog->progs->crc != prog->headercrc && prog->progs->crc != prog->headercrc2)
- PRVM_ERROR ("%s: %s system vars have been modified (CRC of progs.dat systemvars %i != engine %i), progdefs.h is out of date", PRVM_NAME, filename, prog->progs->crc, prog->headercrc);
+ prog->filecrc = CRC_Block((unsigned char *)dprograms, filesize);
- //prog->functions = (dfunction_t *)((unsigned char *)progs + progs->ofs_functions);
- dfunctions = (dfunction_t *)((unsigned char *)prog->progs + prog->progs->ofs_functions);
-
- if (prog->progs->ofs_strings + prog->progs->numstrings >= (int)filesize)
- PRVM_ERROR ("%s: %s strings go past end of file", PRVM_NAME, filename);
- prog->strings = (char *)prog->progs + prog->progs->ofs_strings;
- prog->stringssize = prog->progs->numstrings;
+// byte swap the header
+ prog->progs_version = LittleLong(dprograms->version);
+ prog->progs_crc = LittleLong(dprograms->crc);
+ if (prog->progs_version != PROG_VERSION)
+ prog->error_cmd("%s: %s has wrong version number (%i should be %i)", prog->name, filename, prog->progs_version, PROG_VERSION);
+ instatements = (dstatement_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_statements));
+ prog->progs_numstatements = LittleLong(dprograms->numstatements);
+ inglobaldefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globaldefs));
+ prog->progs_numglobaldefs = LittleLong(dprograms->numglobaldefs);
+ infielddefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_fielddefs));
+ prog->progs_numfielddefs = LittleLong(dprograms->numfielddefs);
+ infunctions = (dfunction_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_functions));
+ prog->progs_numfunctions = LittleLong(dprograms->numfunctions);
+ instrings = (char *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_strings));
+ prog->progs_numstrings = LittleLong(dprograms->numstrings);
+ inglobals = (float *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globals));
+ prog->progs_numglobals = LittleLong(dprograms->numglobals);
+ prog->progs_entityfields = LittleLong(dprograms->entityfields);
+
+ prog->numstatements = prog->progs_numstatements;
+ prog->numglobaldefs = prog->progs_numglobaldefs;
+ prog->numfielddefs = prog->progs_numfielddefs;
+ prog->numfunctions = prog->progs_numfunctions;
+ prog->numstrings = prog->progs_numstrings;
+ prog->numglobals = prog->progs_numglobals;
+ prog->entityfields = prog->progs_entityfields;
+
+ if (LittleLong(dprograms->ofs_strings) + prog->progs_numstrings >= (int)filesize)
+ prog->error_cmd("%s: %s strings go past end of file", prog->name, filename);
+ prog->strings = (char *)Mem_Alloc(prog->progs_mempool, prog->progs_numstrings);
+ memcpy(prog->strings, instrings, prog->progs_numstrings);
+ prog->stringssize = prog->progs_numstrings;
prog->numknownstrings = 0;
prog->maxknownstrings = 0;
Mem_ExpandableArray_NewArray(&prog->stringbuffersarray, prog->progs_mempool, sizeof(prvm_stringbuffer_t), 64);
- prog->globaldefs = (ddef_t *)((unsigned char *)prog->progs + prog->progs->ofs_globaldefs);
-
- // we need to expand the fielddefs list to include all the engine fields,
- // so allocate a new place for it
- infielddefs = (ddef_t *)((unsigned char *)prog->progs + prog->progs->ofs_fielddefs);
- // ( + DPFIELDS )
- prog->fielddefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs->numfielddefs + numrequiredfields) * sizeof(ddef_t));
-
- prog->statements = (dstatement_t *)((unsigned char *)prog->progs + prog->progs->ofs_statements);
-
- prog->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof(*prog->statement_profile));
-
- //pr_global_struct = (globalvars_t *)((unsigned char *)progs + progs->ofs_globals);
- prog->globals.generic = (float *)((unsigned char *)prog->progs + prog->progs->ofs_globals);
-
-// byte swap the lumps
- for (i=0 ; i<prog->progs->numstatements ; i++)
- {
- prog->statements[i].op = LittleShort(prog->statements[i].op);
- prog->statements[i].a = LittleShort(prog->statements[i].a);
- prog->statements[i].b = LittleShort(prog->statements[i].b);
- prog->statements[i].c = LittleShort(prog->statements[i].c);
+ // we need to expand the globaldefs and fielddefs to include engine defs
+ prog->globaldefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobaldefs + numrequiredglobals) * sizeof(ddef_t));
+ prog->globals.generic = (float *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobals + requiredglobalspace) * sizeof(float));
+ prog->fielddefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numfielddefs + numrequiredfields) * sizeof(ddef_t));
+ // we need to convert the statements to our memory format
+ prog->statements = (mstatement_t *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof(mstatement_t));
+ // allocate space for profiling statement usage
+ prog->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof(*prog->statement_profile));
+ // functions need to be converted to the memory format
+ prog->functions = (mfunction_t *)Mem_Alloc(prog->progs_mempool, sizeof(mfunction_t) * prog->progs_numfunctions);
+
+ for (i = 0;i < prog->progs_numfunctions;i++)
+ {
+ prog->functions[i].first_statement = LittleLong(infunctions[i].first_statement);
+ prog->functions[i].parm_start = LittleLong(infunctions[i].parm_start);
+ prog->functions[i].s_name = LittleLong(infunctions[i].s_name);
+ prog->functions[i].s_file = LittleLong(infunctions[i].s_file);
+ prog->functions[i].numparms = LittleLong(infunctions[i].numparms);
+ prog->functions[i].locals = LittleLong(infunctions[i].locals);
+ memcpy(prog->functions[i].parm_size, infunctions[i].parm_size, sizeof(infunctions[i].parm_size));
+ if(prog->functions[i].first_statement >= prog->numstatements)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds function statement (function %d) in %s", i, prog->name);
+ // TODO bounds check parm_start, s_name, s_file, numparms, locals, parm_size
}
- prog->functions = (mfunction_t *)Mem_Alloc(prog->progs_mempool, sizeof(mfunction_t) * prog->progs->numfunctions);
- for (i = 0;i < prog->progs->numfunctions;i++)
+ // copy the globaldefs to the new globaldefs list
+ for (i=0 ; i<prog->numglobaldefs ; i++)
{
- prog->functions[i].first_statement = LittleLong (dfunctions[i].first_statement);
- prog->functions[i].parm_start = LittleLong (dfunctions[i].parm_start);
- prog->functions[i].s_name = LittleLong (dfunctions[i].s_name);
- prog->functions[i].s_file = LittleLong (dfunctions[i].s_file);
- 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
+ prog->globaldefs[i].type = LittleShort(inglobaldefs[i].type);
+ prog->globaldefs[i].ofs = LittleShort(inglobaldefs[i].ofs);
+ prog->globaldefs[i].s_name = LittleLong(inglobaldefs[i].s_name);
+ // TODO bounds check ofs, s_name
}
- for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ // append the required globals
+ for (i = 0;i < numrequiredglobals;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
+ prog->globaldefs[prog->numglobaldefs].type = required_global[i].type;
+ prog->globaldefs[prog->numglobaldefs].ofs = prog->numglobals;
+ prog->globaldefs[prog->numglobaldefs].s_name = PRVM_SetEngineString(prog, required_global[i].name);
+ if (prog->globaldefs[prog->numglobaldefs].type == ev_vector)
+ prog->numglobals += 3;
+ else
+ prog->numglobals++;
+ prog->numglobaldefs++;
}
// copy the progs fields to the new fields list
- for (i = 0;i < prog->progs->numfielddefs;i++)
+ for (i = 0;i < prog->numfielddefs;i++)
{
- prog->fielddefs[i].type = LittleShort (infielddefs[i].type);
+ prog->fielddefs[i].type = LittleShort(infielddefs[i].type);
if (prog->fielddefs[i].type & DEF_SAVEGLOBAL)
- 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);
+ prog->error_cmd("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", prog->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
- for (i = 0;i < (int) numrequiredfields;i++)
+ for (i = 0;i < numrequiredfields;i++)
{
- 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;
+ prog->fielddefs[prog->numfielddefs].type = required_field[i].type;
+ prog->fielddefs[prog->numfielddefs].ofs = prog->entityfields;
+ prog->fielddefs[prog->numfielddefs].s_name = PRVM_SetEngineString(prog, required_field[i].name);
+ if (prog->fielddefs[prog->numfielddefs].type == ev_vector)
+ prog->entityfields += 3;
else
- prog->progs->entityfields++;
- prog->progs->numfielddefs++;
+ prog->entityfields++;
+ prog->numfielddefs++;
}
- prog->entityfields = prog->progs->entityfields;
- // check required functions
- for(i=0 ; i < numrequiredfunc ; i++)
- if(PRVM_ED_FindFunction(required_func[i]) == 0)
- PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_func[i], filename);
-
- // check required globals
- for(i=0 ; i < numrequiredglobals ; i++)
- if(PRVM_ED_FindGlobal(required_global[i]) == 0)
- PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_global[i], filename);
+ // LordHavoc: TODO: reorder globals to match engine struct
+ // LordHavoc: TODO: reorder fields to match engine struct
+#define remapglobal(index) (index)
+#define remapfield(index) (index)
- for (i=0 ; i<prog->progs->numglobals ; i++)
- ((int *)prog->globals.generic)[i] = LittleLong (((int *)prog->globals.generic)[i]);
+ // copy globals
+ for (i = 0;i < prog->progs_numglobals;i++)
+ ((int *)prog->globals.generic)[remapglobal(i)] = LittleLong(((int *)inglobals)[i]);
- // LordHavoc: bounds check anything static
- for (i = 0,st = prog->statements;i < prog->progs->numstatements;i++,st++)
+ // LordHavoc: TODO: support 32bit progs statement formats
+ // copy, remap globals in statements, bounds check
+ for (i = 0;i < prog->progs_numstatements;i++)
{
- switch (st->op)
+ op = (opcode_t)LittleShort(instatements[i].op);
+ a = (unsigned short)LittleShort(instatements[i].a);
+ b = (unsigned short)LittleShort(instatements[i].b);
+ c = (unsigned short)LittleShort(instatements[i].c);
+ switch (op)
{
case OP_IF:
case OP_IFNOT:
- if ((unsigned short) st->a >= prog->progs->numglobals || st->b + i < 0 || st->b + i >= prog->progs->numstatements)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds IF/IFNOT (statement %d) in %s", i, PRVM_NAME);
+ b = (short)b;
+ if (a >= prog->progs_numglobals || b + i < 0 || b + i >= prog->progs_numstatements)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds IF/IFNOT (statement %d) in %s", i, prog->name);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = remapglobal(a);
+ prog->statements[i].operand[1] = -1;
+ prog->statements[i].operand[2] = -1;
+ prog->statements[i].jumpabsolute = i + b;
break;
case OP_GOTO:
- if (st->a + i < 0 || st->a + i >= prog->progs->numstatements)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds GOTO (statement %d) in %s", i, PRVM_NAME);
+ a = (short)a;
+ if (a + i < 0 || a + i >= prog->progs_numstatements)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds GOTO (statement %d) in %s", i, prog->name);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = -1;
+ prog->statements[i].operand[1] = -1;
+ prog->statements[i].operand[2] = -1;
+ prog->statements[i].jumpabsolute = i + a;
break;
+ default:
+ Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", (int)op, i, prog->name);
// global global global
case OP_ADD_F:
case OP_ADD_V:
case OP_LOAD_S:
case OP_LOAD_FNC:
case OP_LOAD_V:
- if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->b >= prog->progs->numglobals || (unsigned short) st->c >= prog->progs->numglobals)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d)", i);
+ if (a >= prog->progs_numglobals || b >= prog->progs_numglobals || c >= prog->progs_numglobals)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d)", i);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = remapglobal(a);
+ prog->statements[i].operand[1] = remapglobal(b);
+ prog->statements[i].operand[2] = remapglobal(c);
+ prog->statements[i].jumpabsolute = -1;
break;
// global none global
case OP_NOT_F:
case OP_NOT_S:
case OP_NOT_FNC:
case OP_NOT_ENT:
- if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->c >= prog->progs->numglobals)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME);
+ if (a >= prog->progs_numglobals || c >= prog->progs_numglobals)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, prog->name);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = remapglobal(a);
+ prog->statements[i].operand[1] = -1;
+ prog->statements[i].operand[2] = remapglobal(c);
+ prog->statements[i].jumpabsolute = -1;
break;
// 2 globals
case OP_STOREP_F:
case OP_STATE:
case OP_STOREP_V:
case OP_STORE_V:
- if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->b >= prog->progs->numglobals)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME);
+ if (a >= prog->progs_numglobals || b >= prog->progs_numglobals)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, prog->name);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = remapglobal(a);
+ prog->statements[i].operand[1] = remapglobal(b);
+ prog->statements[i].operand[2] = -1;
+ prog->statements[i].jumpabsolute = -1;
break;
// 1 global
case OP_CALL0:
case OP_CALL8:
case OP_DONE:
case OP_RETURN:
- if ((unsigned short) st->a >= prog->progs->numglobals)
- PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME);
- break;
- default:
- Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", st->op, i, PRVM_NAME);
+ if ( a >= prog->progs_numglobals)
+ prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, prog->name);
+ prog->statements[i].op = op;
+ prog->statements[i].operand[0] = remapglobal(a);
+ prog->statements[i].operand[1] = -1;
+ prog->statements[i].operand[2] = -1;
+ prog->statements[i].jumpabsolute = -1;
break;
}
}
- if(prog->progs->numstatements < 1)
+ if(prog->numstatements < 1)
{
- PRVM_ERROR("PRVM_LoadProgs: empty program in %s", PRVM_NAME);
+ prog->error_cmd("PRVM_LoadProgs: empty program in %s", prog->name);
}
- else switch(prog->statements[prog->progs->numstatements - 1].op)
+ else switch(prog->statements[prog->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);
+ prog->error_cmd("PRVM_LoadProgs: program may fall off the edge (does not end with RETURN, GOTO or DONE) in %s", prog->name);
break;
}
- PRVM_LoadLNO(filename);
+ // we're done with the file now
+ Mem_Free(dprograms);
+ dprograms = NULL;
+
+ // check required functions
+ for(i=0 ; i < numrequiredfunc ; i++)
+ if(PRVM_ED_FindFunction(prog, required_func[i]) == 0)
+ prog->error_cmd("%s: %s not found in %s",prog->name, required_func[i], filename);
- PRVM_Init_Exec();
+ PRVM_LoadLNO(prog, filename);
- for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ PRVM_Init_Exec(prog);
+
+ if(*prvm_language.string)
+ // in CSQC we really shouldn't be able to change how stuff works... sorry for now
+ // later idea: include a list of authorized .po file checksums with the csprogs
+ {
+ qboolean deftrans = prog == CLVM_prog;
+ const char *realfilename = (prog != CLVM_prog ? filename : csqc_progname.string);
+ if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method!
+ {
+ for (i=0 ; i<prog->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog, prog->globaldefs[i].s_name);
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ if(name && !strncmp(name, "dotranslate_", 12))
+ {
+ deftrans = false;
+ break;
+ }
+ }
+ }
+ if(!strcmp(prvm_language.string, "dump"))
+ {
+ qfile_t *f = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "%s.pot", realfilename), "w", false);
+ Con_Printf("Dumping to %s.pot\n", realfilename);
+ if(f)
+ {
+ for (i=0 ; i<prog->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog, prog->globaldefs[i].s_name);
+ if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12)))
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ {
+ prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs);
+ const char *value = PRVM_GetString(prog, val->string);
+ if(*value)
+ {
+ char buf[MAX_INPUTLINE];
+ PRVM_PO_UnparseString(buf, value, sizeof(buf));
+ FS_Printf(f, "msgid \"%s\"\nmsgstr \"\"\n\n", buf);
+ }
+ }
+ }
+ FS_Close(f);
+ }
+ }
+ else
+ {
+ po_t *po = PRVM_PO_Load(va(vabuf, sizeof(vabuf), "%s.%s.po", realfilename, prvm_language.string), prog->progs_mempool);
+ if(po)
+ {
+ for (i=0 ; i<prog->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog, prog->globaldefs[i].s_name);
+ if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12)))
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ {
+ prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs);
+ const char *value = PRVM_GetString(prog, val->string);
+ if(*value)
+ {
+ value = PRVM_PO_Lookup(po, value);
+ if(value)
+ val->string = PRVM_SetEngineString(prog, value);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ for (i=0 ; i<prog->numglobaldefs ; i++)
{
const char *name;
- name = PRVM_GetString(prog->globaldefs[i].s_name);
+ name = PRVM_GetString(prog, 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'))
+ && !(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);
+ prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs);
cvar_t *cvar = Cvar_FindVar(name + 9);
+ //Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, prog->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);
+ Con_DPrintf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, prog->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);
+ dpsnprintf(buf, sizeof(buf), "%.9g", 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;
+ dpsnprintf(buf, sizeof(buf), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); value = buf;
break;
case ev_string:
- value = PRVM_GetString(val->string);
+ value = PRVM_GetString(prog, val->string);
break;
default:
- Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, prog->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;
+ val->string = PRVM_SetEngineString(prog, cvar->string);
+ cvar->globaldefindex_stringno[prog - prvm_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;
+ prog->error_cmd("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, prog->name);
+ cvar->globaldefindex_progid[prog - prvm_prog_list] = prog->id;
+ cvar->globaldefindex[prog - prvm_prog_list] = i;
}
else if((cvar->flags & CVAR_PRIVATE) == 0)
{
}
break;
case ev_string:
- val->string = PRVM_SetEngineString(cvar->string);
- cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+ val->string = PRVM_SetEngineString(prog, cvar->string);
+ cvar->globaldefindex_stringno[prog - prvm_prog_list] = val->string;
break;
default:
- Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, prog->name);
goto fail;
}
- cvar->globaldefindex_progid[prog - prog_list] = prog->id;
- cvar->globaldefindex[prog - prog_list] = i;
+ cvar->globaldefindex_progid[prog - prvm_prog_list] = prog->id;
+ cvar->globaldefindex[prog - prvm_prog_list] = i;
}
else
- Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME);
+ Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, prog->name);
}
fail:
- if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_vector)
- i += 3; // skip the _x _y _z floats
+ ;
}
prog->loaded = TRUE;
prog->flag = 0;
- PRVM_FindOffsets();
+ PRVM_FindOffsets(prog);
- PRVM_GCALL(init_cmd)();
+ prog->init_cmd(prog);
// init mempools
- PRVM_MEM_Alloc();
+ PRVM_MEM_Alloc(prog);
}
-void PRVM_Fields_f (void)
+static void PRVM_Fields_f (void)
{
+ prvm_prog_t *prog;
int i, j, ednum, used, usedamount;
int *counts;
char tempstring[MAX_INPUTLINE], tempstring2[260];
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- counts = (int *)Mem_Alloc(tempmempool, prog->progs->numfielddefs * sizeof(int));
+ counts = (int *)Mem_Alloc(tempmempool, prog->numfielddefs * sizeof(int));
for (ednum = 0;ednum < prog->max_edicts;ednum++)
{
ed = PRVM_EDICT_NUM(ednum);
if (ed->priv.required->free)
continue;
- for (i = 1;i < prog->progs->numfielddefs;i++)
+ for (i = 1;i < prog->numfielddefs;i++)
{
d = &prog->fielddefs[i];
- name = PRVM_GetString(d->s_name);
+ name = PRVM_GetString(prog, d->s_name);
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
v = (int *)(ed->fields.vp + d->ofs);
used = 0;
usedamount = 0;
tempstring[0] = 0;
- for (i = 0;i < prog->progs->numfielddefs;i++)
+ for (i = 0;i < prog->numfielddefs;i++)
{
d = &prog->fielddefs[i];
- name = PRVM_GetString(d->s_name);
+ name = PRVM_GetString(prog, d->s_name);
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
switch(d->type & ~DEF_SAVEGLOBAL)
}
}
Mem_Free(counts);
- Con_Printf("%s: %i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts allocated, %i bytes total spent on edict fields (%i needed)\n", PRVM_NAME, prog->progs->entityfields, used, prog->progs->entityfields * 4, usedamount * 4, prog->max_edicts, prog->progs->entityfields * 4 * prog->max_edicts, usedamount * 4 * prog->max_edicts);
-
- PRVM_End;
+ Con_Printf("%s: %i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts allocated, %i bytes total spent on edict fields (%i needed)\n", prog->name, prog->entityfields, used, prog->entityfields * 4, usedamount * 4, prog->max_edicts, prog->entityfields * 4 * prog->max_edicts, usedamount * 4 * prog->max_edicts);
}
-void PRVM_Globals_f (void)
+static void PRVM_Globals_f (void)
{
+ prvm_prog_t *prog;
int i;
const char *wildcard;
int numculled;
return;
}
- PRVM_Begin;
- if(!PRVM_SetProgFromString (Cmd_Argv (1)))
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
if( Cmd_Argc() == 3)
else
wildcard = NULL;
- Con_Printf("%s :", PRVM_NAME);
+ Con_Printf("%s :", prog->name);
- for (i = 0;i < prog->progs->numglobaldefs;i++)
+ for (i = 0;i < prog->numglobaldefs;i++)
{
if(wildcard)
- if( !matchpattern( PRVM_GetString(prog->globaldefs[i].s_name), wildcard, 1) )
+ if( !matchpattern( PRVM_GetString(prog, prog->globaldefs[i].s_name), wildcard, 1) )
{
numculled++;
continue;
}
- Con_Printf("%s\n", PRVM_GetString(prog->globaldefs[i].s_name));
+ Con_Printf("%s\n", PRVM_GetString(prog, prog->globaldefs[i].s_name));
}
- Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->progs->numglobals, numculled, prog->progs->numglobals * 4);
-
- PRVM_End;
+ Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->numglobals, numculled, prog->numglobals * 4);
}
/*
PRVM_Global
===============
*/
-void PRVM_Global_f(void)
+static void PRVM_Global_f(void)
{
+ prvm_prog_t *prog;
ddef_t *global;
+ char valuebuf[MAX_INPUTLINE];
if( Cmd_Argc() != 3 ) {
Con_Printf( "prvm_global <program name> <global name>\n" );
return;
}
- PRVM_Begin;
- if( !PRVM_SetProgFromString( Cmd_Argv(1) ) )
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- global = PRVM_ED_FindGlobal( Cmd_Argv(2) );
+ global = PRVM_ED_FindGlobal( prog, Cmd_Argv(2) );
if( !global )
Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) );
else
- Con_Printf( "%s: %s\n", Cmd_Argv(2), PRVM_ValueString( (etype_t)global->type, (prvm_eval_t *) &prog->globals.generic[ global->ofs ] ) );
- PRVM_End;
+ Con_Printf( "%s: %s\n", Cmd_Argv(2), PRVM_ValueString( prog, (etype_t)global->type, PRVM_GLOBALFIELDVALUE(global->ofs), valuebuf, sizeof(valuebuf) ) );
}
/*
PRVM_GlobalSet
===============
*/
-void PRVM_GlobalSet_f(void)
+static void PRVM_GlobalSet_f(void)
{
+ prvm_prog_t *prog;
ddef_t *global;
if( Cmd_Argc() != 4 ) {
Con_Printf( "prvm_globalset <program name> <global name> <value>\n" );
return;
}
- PRVM_Begin;
- if( !PRVM_SetProgFromString( Cmd_Argv(1) ) )
+ if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
return;
- global = PRVM_ED_FindGlobal( Cmd_Argv(2) );
+ global = PRVM_ED_FindGlobal( prog, Cmd_Argv(2) );
if( !global )
Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) );
else
- PRVM_ED_ParseEpair( NULL, global, Cmd_Argv(3), true );
- PRVM_End;
+ PRVM_ED_ParseEpair( prog, NULL, global, Cmd_Argv(3), true );
}
/*
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");
- // COMMANDLINEOPTION: PRVM: -noboundscheck disables the bounds checks (security hole if CSQC is in use!)
- prvm_boundscheck = !COM_CheckParm("-noboundscheck");
-
+ Cvar_RegisterVariable (&prvm_language);
Cvar_RegisterVariable (&prvm_traceqc);
Cvar_RegisterVariable (&prvm_statementprofiling);
+ Cvar_RegisterVariable (&prvm_timeprofiling);
Cvar_RegisterVariable (&prvm_backtraceforwarnings);
Cvar_RegisterVariable (&prvm_leaktest);
Cvar_RegisterVariable (&prvm_leaktest_ignore_classnames);
PRVM_InitProg
===============
*/
-void PRVM_InitProg(int prognr)
+void PRVM_Prog_Init(prvm_prog_t *prog)
{
- static unsigned int progid = 0;
-
- if(prognr < 0 || prognr >= PRVM_MAXPROGS)
- Sys_Error("PRVM_InitProg: Invalid program number %i",prognr);
-
- prog = &prog_list[prognr];
-
- if(prog->loaded)
- PRVM_ResetProg();
+ if (prog->loaded)
+ PRVM_Prog_Reset(prog);
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 != 0;
}
-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, NULL, buffersize, 16, filename, fileline);
-}
-
-void _PRVM_Free(void *buffer, const char *filename, int fileline)
-{
- _Mem_Free(buffer, filename, fileline);
-}
-
-void _PRVM_FreeAll(const char *filename, int fileline)
-{
- prog->progs = NULL;
- prog->fielddefs = NULL;
- prog->functions = NULL;
- _Mem_EmptyPool(prog->progs_mempool, filename, fileline);
-}
-
// LordHavoc: turned PRVM_EDICT_NUM into a #define for speed reasons
-unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline)
+unsigned int PRVM_EDICT_NUM_ERROR(prvm_prog_t *prog, unsigned int n, const char *filename, int fileline)
{
- PRVM_ERROR ("PRVM_EDICT_NUM: %s: bad number %i (called at %s:%i)", PRVM_NAME, n, filename, fileline);
+ prog->error_cmd("PRVM_EDICT_NUM: %s: bad number %i (called at %s:%i)", prog->name, n, filename, fileline);
return 0;
}
-sizebuf_t vm_tempstringsbuf;
+#define PRVM_KNOWNSTRINGBASE 0x40000000
-const char *PRVM_GetString(int num)
+const char *PRVM_GetString(prvm_prog_t *prog, int num)
{
- if (num >= 0)
+ if (num < 0)
{
- if (num < prog->stringssize)
- return prog->strings + num;
- else
-#if 1
- if (num <= prog->stringssize + vm_tempstringsbuf.maxsize)
- {
- num -= prog->stringssize;
- if (num < vm_tempstringsbuf.cursize)
- return (char *)vm_tempstringsbuf.data + num;
- else
- {
- VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
- return "";
- }
- }
+ // invalid
+ VM_Warning(prog, "PRVM_GetString: Invalid string offset (%i < 0)\n", num);
+ return "";
+ }
+ else if (num < prog->stringssize)
+ {
+ // constant string from progs.dat
+ return prog->strings + num;
+ }
+ else if (num <= prog->stringssize + prog->tempstringsbuf.maxsize)
+ {
+ // tempstring returned by engine to QC (becomes invalid after returning to engine)
+ num -= prog->stringssize;
+ if (num < prog->tempstringsbuf.cursize)
+ return (char *)prog->tempstringsbuf.data + num;
else
-#endif
{
- VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ VM_Warning(prog, "PRVM_GetString: Invalid temp-string offset (%i >= %i prog->tempstringsbuf.cursize)\n", num, prog->tempstringsbuf.cursize);
return "";
}
}
- else
+ else if (num & PRVM_KNOWNSTRINGBASE)
{
- num = -1 - num;
-#if 0
- if (num >= (1<<30))
- {
- // special range reserved for tempstrings
- num -= (1<<30);
- if (num < vm_tempstringsbuf.cursize)
- return (char *)vm_tempstringsbuf.data + num;
- else
- {
- VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
- return "";
- }
- }
- else
-#endif
- if (num < prog->numknownstrings)
+ // allocated string
+ num = num - PRVM_KNOWNSTRINGBASE;
+ if (num >= 0 && num < prog->numknownstrings)
{
if (!prog->knownstrings[num])
{
- VM_Warning("PRVM_GetString: Invalid zone-string offset (%i has been freed)\n", num);
+ VM_Warning(prog, "PRVM_GetString: Invalid zone-string offset (%i has been freed)\n", num);
return "";
}
return prog->knownstrings[num];
}
else
{
- VM_Warning("PRVM_GetString: Invalid zone-string offset (%i >= %i)\n", num, prog->numknownstrings);
+ VM_Warning(prog, "PRVM_GetString: Invalid zone-string offset (%i >= %i)\n", num, prog->numknownstrings);
return "";
}
}
+ else
+ {
+ // invalid string offset
+ VM_Warning(prog, "PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ return "";
+ }
}
-const char *PRVM_ChangeEngineString(int i, const char *s)
+const char *PRVM_ChangeEngineString(prvm_prog_t *prog, int i, const char *s)
{
const char *old;
- i = -1 - i;
+ i = i - PRVM_KNOWNSTRINGBASE;
if(i < 0 || i >= prog->numknownstrings)
- PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
+ prog->error_cmd("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 PRVM_SetEngineString(prvm_prog_t *prog, const char *s)
{
int i;
if (!s)
return 0;
if (s >= prog->strings && s <= prog->strings + prog->stringssize)
- PRVM_ERROR("PRVM_SetEngineString: s in prog->strings area");
+ prog->error_cmd("PRVM_SetEngineString: s in prog->strings area");
// if it's in the tempstrings area, use a reserved range
// (otherwise we'd get millions of useless string offsets cluttering the database)
- if (s >= (char *)vm_tempstringsbuf.data && s < (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.maxsize)
+ if (s >= (char *)prog->tempstringsbuf.data && s < (char *)prog->tempstringsbuf.data + prog->tempstringsbuf.maxsize)
#if 1
- return prog->stringssize + (s - (char *)vm_tempstringsbuf.data);
-#else
- return -1 - ((1<<30) + (s - (char *)vm_tempstringsbuf.data));
+ return prog->stringssize + (s - (char *)prog->tempstringsbuf.data);
#endif
// see if it's a known string address
for (i = 0;i < prog->numknownstrings;i++)
if (prog->knownstrings[i] == s)
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
// new unknown engine string
- if (developer.integer >= 200)
- Con_Printf("new engine string %p = \"%s\"\n", s, s);
+ if (developer_insane.integer)
+ Con_DPrintf("new engine string %p = \"%s\"\n", s, s);
for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
if (!prog->knownstrings[i])
break;
prog->knownstrings_freeable[i] = false;
if(prog->leaktest_active)
prog->knownstrings_origin[i] = NULL;
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
// temp string handling
// buffer)
// the buffer size is automatically grown as needed
-int PRVM_SetTempString(const char *s)
+int PRVM_SetTempString(prvm_prog_t *prog, const char *s)
{
int size;
char *t;
if (!s)
return 0;
size = (int)strlen(s) + 1;
- if (developer.integer >= 300)
- Con_Printf("PRVM_SetTempString: cursize %i, size %i\n", vm_tempstringsbuf.cursize, size);
- if (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size)
- {
- sizebuf_t old = vm_tempstringsbuf;
- if (vm_tempstringsbuf.cursize + size >= 1<<28)
- PRVM_ERROR("PRVM_SetTempString: ran out of tempstring memory! (refusing to grow tempstring buffer over 256MB, cursize %i, size %i)\n", vm_tempstringsbuf.cursize, size);
- vm_tempstringsbuf.maxsize = max(vm_tempstringsbuf.maxsize, 65536);
- while (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size)
- vm_tempstringsbuf.maxsize *= 2;
- if (vm_tempstringsbuf.maxsize != old.maxsize || vm_tempstringsbuf.data == NULL)
+ if (developer_insane.integer)
+ Con_DPrintf("PRVM_SetTempString: cursize %i, size %i\n", prog->tempstringsbuf.cursize, size);
+ if (prog->tempstringsbuf.maxsize < prog->tempstringsbuf.cursize + size)
+ {
+ sizebuf_t old = prog->tempstringsbuf;
+ if (prog->tempstringsbuf.cursize + size >= 1<<28)
+ prog->error_cmd("PRVM_SetTempString: ran out of tempstring memory! (refusing to grow tempstring buffer over 256MB, cursize %i, size %i)\n", prog->tempstringsbuf.cursize, size);
+ prog->tempstringsbuf.maxsize = max(prog->tempstringsbuf.maxsize, 65536);
+ while (prog->tempstringsbuf.maxsize < prog->tempstringsbuf.cursize + size)
+ prog->tempstringsbuf.maxsize *= 2;
+ if (prog->tempstringsbuf.maxsize != old.maxsize || prog->tempstringsbuf.data == NULL)
{
- if (developer.integer >= 100)
- Con_Printf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024);
- vm_tempstringsbuf.data = (unsigned char *) Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize);
+ Con_DPrintf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, prog->tempstringsbuf.maxsize/1024);
+ prog->tempstringsbuf.data = (unsigned char *) Mem_Alloc(prog->progs_mempool, prog->tempstringsbuf.maxsize);
if (old.cursize)
- memcpy(vm_tempstringsbuf.data, old.data, old.cursize);
+ memcpy(prog->tempstringsbuf.data, old.data, old.cursize);
if (old.data)
Mem_Free(old.data);
}
}
- t = (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.cursize;
+ t = (char *)prog->tempstringsbuf.data + prog->tempstringsbuf.cursize;
memcpy(t, s, size);
- vm_tempstringsbuf.cursize += size;
- return PRVM_SetEngineString(t);
+ prog->tempstringsbuf.cursize += size;
+ return PRVM_SetEngineString(prog, t);
}
-int PRVM_AllocString(size_t bufferlength, char **pointer)
+int PRVM_AllocString(prvm_prog_t *prog, size_t bufferlength, char **pointer)
{
int i;
if (!bufferlength)
if(prog->leaktest_active)
memcpy((char **)prog->knownstrings_origin, oldstrings_origin, prog->numknownstrings * sizeof(char *));
}
- // TODO why not Mem_Free the old ones?
+ if (oldstrings)
+ Mem_Free((char **)oldstrings);
+ if (oldstrings_freeable)
+ Mem_Free((unsigned char *)oldstrings_freeable);
+ if (oldstrings_origin)
+ Mem_Free((char **)oldstrings_origin);
}
prog->numknownstrings++;
}
prog->knownstrings[i] = (char *)PRVM_Alloc(bufferlength);
prog->knownstrings_freeable[i] = true;
if(prog->leaktest_active)
- prog->knownstrings_origin[i] = PRVM_AllocationOrigin();
+ prog->knownstrings_origin[i] = PRVM_AllocationOrigin(prog);
if (pointer)
*pointer = (char *)(prog->knownstrings[i]);
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
-void PRVM_FreeString(int num)
+void PRVM_FreeString(prvm_prog_t *prog, int num)
{
if (num == 0)
- PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string");
+ prog->error_cmd("PRVM_FreeString: attempt to free a NULL string");
else if (num >= 0 && num < prog->stringssize)
- PRVM_ERROR("PRVM_FreeString: attempt to free a constant string");
- else if (num < 0 && num >= -prog->numknownstrings)
+ prog->error_cmd("PRVM_FreeString: attempt to free a constant string");
+ else if (num >= PRVM_KNOWNSTRINGBASE && num < PRVM_KNOWNSTRINGBASE + prog->numknownstrings)
{
- num = -1 - num;
+ num = num - PRVM_KNOWNSTRINGBASE;
if (!prog->knownstrings[num])
- PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string");
+ prog->error_cmd("PRVM_FreeString: attempt to free a non-existent or already freed string");
if (!prog->knownstrings_freeable[num])
- PRVM_ERROR("PRVM_FreeString: attempt to free a string owned by the engine");
+ prog->error_cmd("PRVM_FreeString: attempt to free a string owned by the engine");
PRVM_Free((char *)prog->knownstrings[num]);
if(prog->leaktest_active)
if(prog->knownstrings_origin[num])
prog->firstfreeknownstring = min(prog->firstfreeknownstring, num);
}
else
- PRVM_ERROR("PRVM_FreeString: invalid string offset %i", num);
+ prog->error_cmd("PRVM_FreeString: invalid string offset %i", num);
}
-static qboolean PRVM_IsStringReferenced(string_t string)
+static qboolean PRVM_IsStringReferenced(prvm_prog_t *prog, string_t string)
{
int i, j;
- for (i = 0;i < prog->progs->numglobaldefs;i++)
+ for (i = 0;i < prog->numglobaldefs;i++)
{
ddef_t *d = &prog->globaldefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
- if(string == ((prvm_eval_t *) &prog->globals.generic[d->ofs])->string)
+ if(string == PRVM_GLOBALFIELDSTRING(d->ofs))
return true;
}
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
if (ed->priv.required->free)
continue;
- for (i=0; i<prog->progs->numfielddefs; ++i)
+ for (i=0; i<prog->numfielddefs; ++i)
{
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
- if(string == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->string)
+ if(string == PRVM_EDICTFIELDSTRING(ed, d->ofs))
return true;
}
}
return false;
}
-static qboolean PRVM_IsEdictRelevant(prvm_edict_t *edict)
+static qboolean PRVM_IsEdictRelevant(prvm_prog_t *prog, prvm_edict_t *edict)
{
+ char vabuf[1024];
+ char vabuf2[1024];
if(PRVM_NUM_FOR_EDICT(edict) <= prog->reserved_edicts)
return true; // world or clients
- switch(prog - prog_list)
+ if (prog == SVVM_prog)
{
- case PRVM_SERVERPROG:
- {
- entvars_t *ev = edict->fields.server;
- if(ev->solid) // can block other stuff, or is a trigger?
- return true;
- if(ev->modelindex) // visible ent?
- return true;
- if(ev->effects) // particle effect?
- return true;
- if(ev->think) // has a think function?
- if(ev->nextthink > 0) // that actually will eventually run?
- return true;
- if(ev->takedamage)
- return true;
- if(*prvm_leaktest_ignore_classnames.string)
- {
- if(strstr(va(" %s ", prvm_leaktest_ignore_classnames.string), va(" %s ", PRVM_GetString(ev->classname))))
- return true;
- }
- }
- break;
- case PRVM_CLIENTPROG:
- {
- // 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?
- return true;
- if(ev->think) // has a think function?
- if(ev->nextthink > 0) // that actually will eventually run?
- return true;
- if(*prvm_leaktest_ignore_classnames.string)
- {
- if(strstr(va(" %s ", prvm_leaktest_ignore_classnames.string), va(" %s ", PRVM_GetString(ev->classname))))
- return true;
- }
- }
- break;
- case PRVM_MENUPROG:
- // menu prog does not have classnames
- break;
+ if(PRVM_serveredictfloat(edict, solid)) // can block other stuff, or is a trigger?
+ return true;
+ if(PRVM_serveredictfloat(edict, modelindex)) // visible ent?
+ return true;
+ if(PRVM_serveredictfloat(edict, effects)) // particle effect?
+ return true;
+ if(PRVM_serveredictfunction(edict, think)) // has a think function?
+ if(PRVM_serveredictfloat(edict, nextthink) > 0) // that actually will eventually run?
+ return true;
+ if(PRVM_serveredictfloat(edict, takedamage))
+ return true;
+ if(*prvm_leaktest_ignore_classnames.string)
+ {
+ if(strstr(va(vabuf, sizeof(vabuf), " %s ", prvm_leaktest_ignore_classnames.string), va(vabuf2, sizeof(vabuf2), " %s ", PRVM_GetString(prog, PRVM_serveredictstring(edict, classname)))))
+ return true;
+ }
+ }
+ else if (prog == CLVM_prog)
+ {
+ // TODO someone add more stuff here
+ if(PRVM_clientedictfloat(edict, entnum)) // csqc networked
+ return true;
+ if(PRVM_clientedictfloat(edict, modelindex)) // visible ent?
+ return true;
+ if(PRVM_clientedictfloat(edict, effects)) // particle effect?
+ return true;
+ if(PRVM_clientedictfunction(edict, think)) // has a think function?
+ if(PRVM_clientedictfloat(edict, nextthink) > 0) // that actually will eventually run?
+ return true;
+ if(*prvm_leaktest_ignore_classnames.string)
+ {
+ if(strstr(va(vabuf, sizeof(vabuf), " %s ", prvm_leaktest_ignore_classnames.string), va(vabuf2, sizeof(vabuf2), " %s ", PRVM_GetString(prog, PRVM_clientedictstring(edict, classname)))))
+ return true;
+ }
+ }
+ else
+ {
+ // menu prog does not have classnames
}
return false;
}
-static qboolean PRVM_IsEdictReferenced(prvm_edict_t *edict, int mark)
+static qboolean PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, int mark)
{
int i, j;
int edictnum = PRVM_NUM_FOR_EDICT(edict);
const char *targetname = NULL;
- switch(prog - prog_list)
- {
- case PRVM_SERVERPROG:
- targetname = PRVM_GetString(edict->fields.server->targetname);
- break;
- }
+ if (prog == SVVM_prog)
+ targetname = PRVM_GetString(prog, PRVM_serveredictstring(edict, targetname));
if(targetname)
if(!*targetname) // ""
targetname = NULL;
- for (i = 0;i < prog->progs->numglobaldefs;i++)
+ if(mark == 0)
{
- ddef_t *d = &prog->globaldefs[i];
- if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
- continue;
- if(edictnum == ((prvm_eval_t *) &prog->globals.generic[d->ofs])->edict)
- return true;
+ for (i = 0;i < prog->numglobaldefs;i++)
+ {
+ ddef_t *d = &prog->globaldefs[i];
+ if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
+ continue;
+ if(edictnum == PRVM_GLOBALFIELDEDICT(d->ofs))
+ return true;
+ }
}
for(j = 0; j < prog->num_edicts; ++j)
continue;
if(targetname)
{
- const char *target = PRVM_GetString(ed->fields.server->target);
+ const char *target = PRVM_GetString(prog, PRVM_serveredictstring(ed, target));
if(target)
if(!strcmp(target, targetname))
return true;
}
- for (i=0; i<prog->progs->numfielddefs; ++i)
+ for (i=0; i<prog->numfielddefs; ++i)
{
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
continue;
- if(edictnum == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->edict)
+ if(edictnum == PRVM_EDICTFIELDEDICT(ed, d->ofs))
return true;
}
}
return false;
}
-static void PRVM_MarkReferencedEdicts(void)
+static void PRVM_MarkReferencedEdicts(prvm_prog_t *prog)
{
int j;
qboolean found_new;
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
if(ed->priv.required->free)
continue;
- ed->priv.required->mark = PRVM_IsEdictRelevant(ed) ? 1 : 0;
+ ed->priv.required->mark = PRVM_IsEdictRelevant(prog, ed) ? 1 : 0;
}
stage = 1;
continue;
if(ed->priv.required->mark)
continue;
- if(PRVM_IsEdictReferenced(ed, stage))
+ if(PRVM_IsEdictReferenced(prog, ed, stage))
{
ed->priv.required->mark = stage + 1;
found_new = true;
Con_DPrintf("leak check used %d stages to find all references\n", stage);
}
-void PRVM_LeakTest(void)
+void PRVM_LeakTest(prvm_prog_t *prog)
{
int i, j;
qboolean leaked = false;
if(prog->knownstrings[i])
if(prog->knownstrings_freeable[i])
if(prog->knownstrings_origin[i])
- if(!PRVM_IsStringReferenced(-1 - i))
+ if(!PRVM_IsStringReferenced(prog, PRVM_KNOWNSTRINGBASE + i))
{
Con_Printf("Unreferenced string found!\n Value: %s\n Origin: %s\n", prog->knownstrings[i], prog->knownstrings_origin[i]);
leaked = true;
}
// 2. Edicts
- PRVM_MarkReferencedEdicts();
+ PRVM_MarkReferencedEdicts(prog);
for(j = 0; j < prog->num_edicts; ++j)
{
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
if(ed->priv.required->allocation_origin)
{
Con_Printf("Unreferenced edict found!\n Allocated at: %s\n", ed->priv.required->allocation_origin);
- PRVM_ED_Print(ed, NULL);
+ PRVM_ED_Print(prog, ed, NULL);
Con_Print("\n");
leaked = true;
}
+
+ ed->priv.required->mark = 0; // clear marks again when done
}
for (i = 0; i < (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray); ++i)
projects / xonotic / darkplaces.git / blobdiff