prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size);
// alloc edict fields
- prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size);
+ prog->entityfieldsarea = prog->entityfields * prog->max_edicts;
+ prog->edictsfields = (vec_t *)Mem_Alloc(prog->progs_mempool, prog->entityfieldsarea * sizeof(vec_t));
// set edict pointers
for(i = 0; i < prog->max_edicts; i++)
{
prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size);
- prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+ prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields;
}
}
void PRVM_MEM_IncreaseEdicts(void)
{
int i;
- int oldmaxedicts = prog->max_edicts;
- void *oldedictsfields = prog->edictsfields;
- void *oldedictprivate = prog->edictprivate;
if(prog->max_edicts >= prog->limit_edicts)
return;
// increase edicts
prog->max_edicts = min(prog->max_edicts + 256, prog->limit_edicts);
- prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size);
- prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size);
-
- memcpy(prog->edictsfields, oldedictsfields, oldmaxedicts * prog->edict_size);
- memcpy(prog->edictprivate, oldedictprivate, oldmaxedicts * prog->edictprivate_size);
+ prog->entityfieldsarea = prog->entityfields * prog->max_edicts;
+ prog->edictsfields = (vec_t*)Mem_Realloc(prog->progs_mempool, (void *)prog->edictsfields, prog->entityfieldsarea * sizeof(vec_t));
+ prog->edictprivate = (void *)Mem_Realloc(prog->progs_mempool, (void *)prog->edictprivate, prog->max_edicts * prog->edictprivate_size);
//set e and v pointers
for(i = 0; i < prog->max_edicts; i++)
{
prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size);
- prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+ prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields;
}
PRVM_GCALL(end_increase_edicts)();
-
- Mem_Free(oldedictsfields);
- Mem_Free(oldedictprivate);
}
//============================================================================
break;
case ev_entity:
n = val->edict;
- if (n < 0 || n >= prog->limit_edicts)
+ if (n < 0 || n >= prog->max_edicts)
dpsnprintf (line, sizeof(line), "entity %i (invalid!)", n);
else
dpsnprintf (line, sizeof(line), "entity %i", n);
// Didn't match; skip
continue;
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
type = d->type & ~DEF_SAVEGLOBAL;
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
type = d->type & ~DEF_SAVEGLOBAL;
mfunction_t *func;
if (ent)
- val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
+ val = (prvm_eval_t *)(ent->fields.vp + key->ofs);
else
- val = (prvm_eval_t *)((int *)prog->globals.generic + key->ofs);
+ val = (prvm_eval_t *)(prog->globals.generic + key->ofs);
switch (key->type & ~DEF_SAVEGLOBAL)
{
case ev_string:
s++;
i = atoi(s);
if (i >= prog->limit_edicts)
- Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, (unsigned int)MAX_EDICTS, PRVM_NAME);
+ Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, prog->limit_edicts, PRVM_NAME);
while (i >= prog->max_edicts)
PRVM_MEM_IncreaseEdicts();
// if IncreaseEdicts was called the base pointer needs to be updated
if (ent)
- val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
+ val = (prvm_eval_t *)(ent->fields.vp + key->ofs);
val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i));
break;
goto fail;
}
- v = (prvm_eval_t *)((char *)ed->fields.vp + key->ofs*4);
+ v = (prvm_eval_t *)(ed->fields.vp + key->ofs);
s = PRVM_UglyValueString(key->type, v);
if(Cmd_Argc() == 5)
{
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.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->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof(*prog->statement_profile));
- // moved edict_size calculation down below field adding code
-
//pr_global_struct = (globalvars_t *)((unsigned char *)progs + progs->ofs_globals);
prog->globals.generic = (float *)((unsigned char *)prog->progs + prog->progs->ofs_globals);
prog->progs->entityfields++;
prog->progs->numfielddefs++;
}
+ prog->entityfields = prog->progs->entityfields;
// check required functions
for(i=0 ; i < numrequiredfunc ; i++)
for (i=0 ; i<prog->progs->numglobals ; i++)
((int *)prog->globals.generic)[i] = LittleLong (((int *)prog->globals.generic)[i]);
- // moved edict_size calculation down here, below field adding code
- // LordHavoc: this no longer includes the prvm_edict_t header
- prog->edict_size = prog->progs->entityfields * 4;
- prog->edictareasize = prog->edict_size * prog->limit_edicts;
-
// LordHavoc: bounds check anything static
for (i = 0,st = prog->statements;i < prog->progs->numstatements;i++,st++)
{
PRVM_Init_Exec();
+ for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog->globaldefs[i].s_name);
+ if(name
+ && !strncmp(name, "autocvar_", 9)
+ // && !(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z'))
+ )
+ {
+ prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs);
+ cvar_t *cvar = Cvar_FindVar(name + 9);
+ if(!cvar)
+ {
+ const char *value;
+ char buf[64];
+ Con_Printf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, PRVM_NAME);
+ switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
+ {
+ case ev_float:
+ if((float)((int)(val->_float)) == val->_float)
+ dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float));
+ else
+ dpsnprintf(buf, sizeof(buf), "%f", val->_float);
+ value = buf;
+ break;
+ case ev_vector:
+ dpsnprintf(buf, sizeof(buf), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]); value = buf;
+ break;
+ case ev_string:
+ value = PRVM_GetString(val->string);
+ break;
+ default:
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ goto fail;
+ }
+ cvar = Cvar_Get(name + 9, value, 0, NULL);
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ {
+ val->string = PRVM_SetEngineString(cvar->string);
+ cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+ }
+ if(!cvar)
+ PRVM_ERROR("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, PRVM_NAME);
+ cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+ cvar->globaldefindex[prog - prog_list] = i;
+ }
+ else if((cvar->flags & CVAR_PRIVATE) == 0)
+ {
+ // MUST BE SYNCED WITH cvar.c Cvar_Set
+ int j;
+ const char *s;
+ switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
+ {
+ case ev_float:
+ val->_float = cvar->value;
+ break;
+ case ev_vector:
+ s = cvar->string;
+ VectorClear(val->vector);
+ for (j = 0;j < 3;j++)
+ {
+ while (*s && ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ val->vector[j] = atof(s);
+ while (!ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ }
+ break;
+ case ev_string:
+ val->string = PRVM_SetEngineString(cvar->string);
+ cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+ break;
+ default:
+ Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+ goto fail;
+ }
+ cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+ cvar->globaldefindex[prog - prog_list] = i;
+ }
+ else
+ Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME);
+ }
+fail:
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_vector)
+ i += 3; // skip the _x _y _z floats
+ }
+
prog->loaded = TRUE;
// set flags & ddef_ts in prog
name = PRVM_GetString(d->s_name);
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
- v = (int *)((char *)ed->fields.vp + d->ofs*4);
+ v = (int *)(ed->fields.vp + d->ofs);
// if the value is still all 0, skip the field
for (j = 0;j < prvm_type_size[d->type & ~DEF_SAVEGLOBAL];j++)
{
*/
void PRVM_InitProg(int prognr)
{
+ static unsigned int progid = 0;
+
if(prognr < 0 || prognr >= PRVM_MAXPROGS)
Sys_Error("PRVM_InitProg: Invalid program number %i",prognr);
memset(prog, 0, sizeof(prvm_prog_t));
prog->starttime = Sys_DoubleTime();
+ prog->id = ++progid;
prog->error_cmd = Host_Error;
prog->leaktest_active = prvm_leaktest.integer != 0;
void *_PRVM_Alloc(size_t buffersize, const char *filename, int fileline)
{
- return _Mem_Alloc(prog->progs_mempool, buffersize, filename, fileline);
+ return _Mem_Alloc(prog->progs_mempool, NULL, buffersize, 16, filename, fileline);
}
void _PRVM_Free(void *buffer, const char *filename, int fileline)
return 0;
}
-/*
-int NUM_FOR_EDICT_ERROR(prvm_edict_t *e)
-{
- PRVM_ERROR ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->edicts);
- return 0;
-}
-
-int PRVM_NUM_FOR_EDICT(prvm_edict_t *e)
-{
- int n;
- n = e - prog->edicts;
- if ((unsigned int)n >= prog->limit_edicts)
- Host_Error ("PRVM_NUM_FOR_EDICT: bad pointer");
- return n;
-}
-
-//int NoCrash_NUM_FOR_EDICT(prvm_edict_t *e)
-//{
-// return e - prog->edicts;
-//}
-
-//#define PRVM_EDICT_TO_PROG(e) ((unsigned char *)(((prvm_edict_t *)e)->v) - (unsigned char *)(prog->edictsfields))
-//#define PRVM_PROG_TO_EDICT(e) (prog->edicts + ((e) / (progs->entityfields * 4)))
-int PRVM_EDICT_TO_PROG(prvm_edict_t *e)
-{
- int n;
- n = e - prog->edicts;
- if ((unsigned int)n >= (unsigned int)prog->max_edicts)
- Host_Error("PRVM_EDICT_TO_PROG: invalid edict %8p (number %i compared to world at %8p)", e, n, prog->edicts);
- return n;// EXPERIMENTAL
- //return (unsigned char *)e->v - (unsigned char *)prog->edictsfields;
-}
-prvm_edict_t *PRVM_PROG_TO_EDICT(int n)
-{
- if ((unsigned int)n >= (unsigned int)prog->max_edicts)
- Host_Error("PRVM_PROG_TO_EDICT: invalid edict number %i", n);
- return prog->edicts + n; // EXPERIMENTAL
- //return prog->edicts + ((n) / (progs->entityfields * 4));
-}
-*/
-
-
sizebuf_t vm_tempstringsbuf;
const char *PRVM_GetString(int num)
}
}
+const char *PRVM_ChangeEngineString(int i, const char *s)
+{
+ const char *old;
+ i = -1 - i;
+ if(i < 0 || i >= prog->numknownstrings)
+ PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
+ old = prog->knownstrings[i];
+ prog->knownstrings[i] = s;
+ return old;
+}
+
int PRVM_SetEngineString(const char *s)
{
int i;
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
- if(string == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->string)
+ if(string == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->string)
return true;
}
}
ddef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
continue;
- if(edictnum == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->edict)
+ if(edictnum == ((prvm_eval_t *) &ed->fields.vp[d->ofs])->edict)
return true;
}
}
projects / xonotic / darkplaces.git / blobdiff