{
int i;
+ // reserve space for the null entity aka world
// check bound of max_edicts
- prog->max_edicts = min(prog->max_edicts,prog->limit_edicts);
+ prog->max_edicts = bound(1, prog->max_edicts, prog->limit_edicts);
+ prog->num_edicts = bound(1, prog->num_edicts, prog->max_edicts);
// edictprivate_size has to be min as big prvm_edict_private_t
prog->edictprivate_size = max(prog->edictprivate_size,(int)sizeof(prvm_edict_private_t));
// the client qc dont need maxclients
// thus it doesnt need to use svs.maxclients
// AK: changed i=svs.maxclients+1
- // AK: changed so the edict 0 wont spawned -> used as reserved/world entity
+ // AK: changed so the edict 0 wont spawn -> used as reserved/world entity
// although the menu/client has no world
for (i = 1;i < prog->num_edicts;i++)
{
e = PRVM_EDICT_NUM(i);
// the first couple seconds of server time can involve a lot of
// freeing and allocating, so relax the replacement policy
- if (e->e->free && ( e->e->freetime < 2 || prog->time - e->e->freetime > 0.5 ) )
+ if (e->e->free && ( e->e->freetime < 2 || (*prog->time - e->e->freetime) > 0.5 ) )
{
PRVM_ED_ClearEdict (e);
return e;
*/
void PRVM_ED_Free (prvm_edict_t *ed)
{
+ // dont delete the null entity (world)
+ if(PRVM_NUM_FOR_EDICT(ed) == 0)
+ return;
+
PRVM_GCALL(free_edict)(ed);
ed->e->free = true;
- ed->e->freetime = prog->time;
+ ed->e->freetime = *prog->time;
}
//===========================================================================
switch (type)
{
case ev_string:
- sprintf (line, "%s", PRVM_GetString(val->string));
+ strncpy(line, PRVM_GetString(val->string), sizeof(line));
break;
case ev_entity:
n = val->edict;
break;
case ev_function:
f = pr_functions + val->function;
- snprintf (line, sizeof (line), "%s", PRVM_GetString(f->s_name));
+ strncpy(line, PRVM_GetString(f->s_name), sizeof(line));
break;
case ev_field:
def = PRVM_ED_FieldAtOfs ( val->_int );
*/
// 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)
+void PRVM_ED_Print(prvm_edict_t *ed)
{
int l;
ddef_t *d;
if (ed->e->free)
{
- Con_Printf ("%s: FREE\n",PRVM_NAME);
+ Con_Printf("%s: FREE\n",PRVM_NAME);
return;
}
strcat(tempstring, "\n");
if (strlen(tempstring) >= 4096)
{
- Con_Printf("%s", tempstring);
+ Con_Print(tempstring);
tempstring[0] = 0;
}
}
if (tempstring[0])
- Con_Printf("%s", tempstring);
+ Con_Print(tempstring);
}
/*
char *name;
int type;
- FS_Printf (f, "{\n");
+ FS_Print(f, "{\n");
if (ed->e->free)
{
- FS_Printf (f, "}\n");
+ FS_Print(f, "}\n");
return;
}
if (j == prvm_type_size[type])
continue;
- FS_Printf (f,"\"%s\" ",name);
- FS_Printf (f,"\"%s\"\n", PRVM_UglyValueString(d->type, (prvm_eval_t *)v));
+ FS_Printf(f,"\"%s\" ",name);
+ FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(d->type, (prvm_eval_t *)v));
}
- FS_Printf (f, "}\n");
+ FS_Print(f, "}\n");
}
void PRVM_ED_PrintNum (int ent)
{
- PRVM_ED_Print (PRVM_EDICT_NUM(ent));
+ PRVM_ED_Print(PRVM_EDICT_NUM(ent));
}
/*
if(!PRVM_SetProgFromString(Cmd_Argv(1)))
return;
- Con_Printf ("%s: %i entities\n", PRVM_NAME, prog->num_edicts);
+ Con_Printf("%s: %i entities\n", PRVM_NAME, prog->num_edicts);
for (i=0 ; i<prog->num_edicts ; i++)
PRVM_ED_PrintNum (i);
i = atoi (Cmd_Argv(2));
if (i >= prog->num_edicts)
{
- Con_Printf("Bad edict number\n");
+ Con_Print("Bad edict number\n");
+ PRVM_End;
return;
}
PRVM_ED_PrintNum (i);
active++;
}
- Con_Printf ("num_edicts:%3i\n", sv.num_edicts);
- Con_Printf ("active :%3i\n", active);
+ Con_Printf("num_edicts:%3i\n", prog->num_edicts);
+ Con_Printf("active :%3i\n", active);
}
PRVM_End;
char *name;
int type;
- FS_Printf (f,"{\n");
+ FS_Print(f,"{\n");
for (i=0 ; i<prog->progs->numglobaldefs ; i++)
{
def = &prog->globaldefs[i];
continue;
name = PRVM_GetString(def->s_name);
- FS_Printf (f,"\"%s\" ", name);
- FS_Printf (f,"\"%s\"\n", PRVM_UglyValueString(type, (prvm_eval_t *)&prog->globals[def->ofs]));
+ FS_Printf(f,"\"%s\" ", name);
+ FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(type, (prvm_eval_t *)&prog->globals[def->ofs]));
}
- FS_Printf (f,"}\n");
+ FS_Print(f,"}\n");
}
/*
key = PRVM_ED_FindGlobal (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, PRVM_NAME);
continue;
}
return new;
}
-
/*
=============
PRVM_ED_ParseEval
switch (key->type & ~DEF_SAVEGLOBAL)
{
case ev_string:
- val->string = PRVM_SetString(ED_NewString(s));
+ val->string = PRVM_SetString(PRVM_ED_NewString(s));
break;
case ev_float:
def = PRVM_ED_FindField(s);
if (!def)
{
- Con_DPrintf("PRVM_ED_ParseEpair: Can't find field %s on %s\n", s, PRVM_NAME);
+ Con_DPrintf("PRVM_ED_ParseEpair: Can't find field %s in %s\n", s, PRVM_NAME);
return false;
}
val->_int = PRVM_G_INT(def->ofs);
func = PRVM_ED_FindFunction(s);
if (!func)
{
- Con_Printf ("PRVM_ED_ParseEpair: Can't find function %s on %s\n", s, PRVM_NAME);
+ Con_Printf("PRVM_ED_ParseEpair: Can't find function %s in %s\n", s, PRVM_NAME);
return false;
}
val->function = func - prog->functions;
return true;
}
+/*
+=============
+PRVM_ED_EdictSet_f
+
+Console command to set a field of a specified edict
+=============
+*/
+void PRVM_ED_EdictSet_f(void)
+{
+ prvm_edict_t *ed;
+ ddef_t *key;
+
+ if(Cmd_Argc() != 5)
+ {
+ Con_Print("prvm_edictset <program name> <edict number> <field> <value>\n");
+ return;
+ }
+
+ PRVM_Begin;
+ if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+ {
+ Con_Printf("Wrong program name %s !\n", Cmd_Argv(1));
+ return;
+ }
+
+ ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(2)));
+
+ if((key = PRVM_ED_FindField(Cmd_Argv(3))) == 0)
+ {
+ Con_Printf("Key %s not found !\n", Cmd_Argv(3));
+ return;
+ }
+
+ PRVM_ED_ParseEpair(ed, key, Cmd_Argv(4));
+
+ PRVM_End;
+}
+
/*
====================
PRVM_ED_ParseEdict
strcpy (keyname, com_token);
- // another hack to fix heynames with trailing spaces
+ // another hack to fix keynames with trailing spaces
n = strlen(keyname);
while (n && keyname[n-1] == ' ')
{
key = PRVM_ED_FindField (keyname);
if (!key)
{
- Con_DPrintf ("%s: '%s' is not a field\n", PRVM_NAME, keyname);
+ Con_DPrintf("%s: '%s' is not a field\n", PRVM_NAME, keyname);
continue;
}
int parsed, inhibited, spawned, died;
mfunction_t *func;
- ent = NULL;
parsed = 0;
inhibited = 0;
spawned = 0;
died = 0;
- // time defined ?
- if(prog->flag & PRVM_GE_TIME)
- PRVM_G_FLOAT(PRVM_ED_FindFieldOffset("time")) = prog->time;
-
+
// parse ents
while (1)
{
if (!COM_ParseToken(&data, false))
break;
if (com_token[0] != '{')
- PRVM_ERROR ("PRVM_ED_LoadFromFile: found %s when expecting (%s) {",com_token, PRVM_NAME);
+ PRVM_ERROR ("PRVM_ED_LoadFromFile: %s: found %s when expecting {", PRVM_NAME, com_token);
- if (!ent)
+ // CHANGED: this is not conform to ED_LoadFromFile
+ if(!prog->num_edicts)
ent = PRVM_EDICT_NUM(0);
- else
- ent = PRVM_ED_Alloc ();
+ else
+ ent = PRVM_ED_Alloc();
+
data = PRVM_ED_ParseEdict (data, ent);
parsed++;
}
//
-// immediately call spawn function, but only if there is a self global
+// immediately call spawn function, but only if there is a self global and a classname
//
if(prog->self && prog->flag & PRVM_FE_CLASSNAME)
{
string_t handle = *(string_t*)&((float*)ent->v)[PRVM_ED_FindFieldOffset("classname")];
if (!handle)
{
- Con_Printf ("No classname for:\n");
- PRVM_ED_Print (ent);
+ Con_Print("No classname for:\n");
+ PRVM_ED_Print(ent);
PRVM_ED_Free (ent);
continue;
}
{
if (developer.integer) // don't confuse non-developers with errors
{
- Con_Printf ("No spawn function for:\n");
- PRVM_ED_Print (ent);
+ Con_Print("No spawn function for:\n");
+ PRVM_ED_Print(ent);
}
PRVM_ED_Free (ent);
continue;
died++;
}
- Con_DPrintf ("%s: %i entities parsed, %i inhibited, %i spawned (%i removed self, %i stayed)\n", PRVM_NAME, parsed, inhibited, 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", PRVM_NAME, parsed, inhibited, prog->num_edicts, spawned, died, spawned - died);
+}
// not used
/*
void PRVM_ResetProg()
{
- mempool_t *t1, *t2, *t3;
+ /*mempool_t *t1, *t2, *t3;
t1 = prog->progs_mempool;
t2 = prog->edictstring_mempool;
Mem_EmptyPool(prog->progs_mempool);
Mem_EmptyPool(prog->edictstring_mempool);
- Mem_EmptyPool(prog->edicts_mempool);
+ Mem_EmptyPool(prog->edicts_mempool);*/
+ Mem_FreePool(&prog->progs_mempool);
+ Mem_FreePool(&prog->edictstring_mempool);
+ Mem_FreePool(&prog->edicts_mempool);
memset(prog,0,sizeof(prvm_prog_t));
+ /*prog->time = &prog->_time;
prog->progs_mempool = t1;
prog->edictstring_mempool = t2;
- prog->edicts_mempool = t3;
+ prog->edicts_mempool = t3;*/
PRVM_GCALL(reset_cmd)();
}
int i;
dstatement_t *st;
ddef_t *infielddefs;
- void *temp;
dfunction_t *dfunctions;
Mem_EmptyPool(prog->progs_mempool);
Mem_EmptyPool(prog->edictstring_mempool);
- temp = FS_LoadFile (filename, false);
- if (temp == 0)
+ prog->progs = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false);
+ if (prog->progs == NULL)
PRVM_ERROR ("PRVM_LoadProgs: couldn't load %s for %s", filename, PRVM_NAME);
- prog->progs = (dprograms_t *)Mem_Alloc(prog->progs_mempool, fs_filesize);
-
- memcpy(prog->progs, temp, fs_filesize);
- Mem_Free(temp);
-
- Con_DPrintf ("%s programs occupy %iK.\n", PRVM_NAME, fs_filesize/1024);
+ Con_DPrintf("%s programs occupy %iK.\n", PRVM_NAME, fs_filesize/1024);
pr_crc = CRC_Block((qbyte *)prog->progs, fs_filesize);
prog->self = PRVM_ED_FindGlobal("self");
if(PRVM_ED_FindGlobal("time"))
- prog->flag |= PRVM_GE_TIME;
+ prog->time = &PRVM_G_FLOAT(PRVM_ED_FindGlobal("time")->ofs);
if(PRVM_ED_FindField ("chain"))
prog->flag |= PRVM_FE_CHAIN;
prog->flag |= PRVM_FE_CLASSNAME;
if(PRVM_ED_FindField ("nextthink") && PRVM_ED_FindField ("frame") && PRVM_ED_FindField ("think")
- && prog->flag & PRVM_GE_TIME && prog->self)
+ && prog->flag && prog->self)
prog->flag |= PRVM_OP_STATE;
PRVM_GCALL(reset_cmd)();
+ PRVM_GCALL(init_cmd)();
// init mempools
PRVM_MEM_Alloc();
/*
if (!sv.active)
{
- Con_Printf("no progs loaded\n");
+ Con_Print("no progs loaded\n");
return;
}
*/
strcat(tempstring, "\n");
if (strlen(tempstring) >= 4096)
{
- Con_Printf("%s", tempstring);
+ Con_Print(tempstring);
tempstring[0] = 0;
}
if (counts[i])
// TODO
/*if (!sv.active)
{
- Con_Printf("no progs loaded\n");
+ Con_Print("no progs loaded\n");
return;
}*/
if(Cmd_Argc () != 2)
{
- Con_Print
("prvm_globals <program name>\n");
+ Con_Print("prvm_globals <program name>\n");
return;
}
Con_Printf("%s :", PRVM_NAME);
for (i = 0;i < prog->progs->numglobaldefs;i++)
- Con_Printf("%s\n", PRVM_GetString(pr_globaldefs[i].s_name));
+ Con_Printf("%s\n", PRVM_GetString(prog->globaldefs[i].s_name));
Con_Printf("%i global variables, totalling %i bytes\n", prog->progs->numglobals, prog->progs->numglobals * 4);
PRVM_End;
Cmd_AddCommand ("prvm_profile", PRVM_Profile_f);
Cmd_AddCommand ("prvm_fields", PRVM_Fields_f);
Cmd_AddCommand ("prvm_globals", PRVM_Globals_f);
+ Cmd_AddCommand ("prvm_edictset", PRVM_ED_EdictSet_f);
// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
Cvar_RegisterVariable (&prvm_boundscheck);
Cvar_RegisterVariable (&prvm_traceqc);
- VM_Cmd_Init();
+ //VM_Cmd_Init();
}
/*
prog = &prog_list[prognr];
+ if(prog->loaded)
+ PRVM_ResetProg();
+
memset(prog, 0, sizeof(prvm_prog_t));
- PRVM_GCALL(init_cmd)();
+ prog->time = &prog->_time;
}
int PRVM_GetProgNr()
return NULL;
}
+void PRVM_ProcessError(void)
+{
+ if(prog)
+ PRVM_GCALL(error_cmd)();
+}
+
/*
int NUM_FOR_EDICT_ERROR(edict_t *e)
{
projects / xonotic / darkplaces.git / blobdiff