*/
// 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, const char *wildcard_fieldname)
{
size_t l;
ddef_t *d;
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars
+ // Check Field Name Wildcard
+ if(wildcard_fieldname)
+ if( !matchpattern(name, wildcard_fieldname, 1) )
+ // Didn't match; skip
+ continue;
+
v = (int *)((char *)ed->fields.vp + d->ofs*4);
// if the value is still all 0, skip the field
FS_Print(f, "}\n");
}
-void PRVM_ED_PrintNum (int ent)
+void PRVM_ED_PrintNum (int ent, const char *wildcard_fieldname)
{
- PRVM_ED_Print(PRVM_EDICT_NUM(ent));
+ PRVM_ED_Print(PRVM_EDICT_NUM(ent), wildcard_fieldname);
}
/*
void PRVM_ED_PrintEdicts_f (void)
{
int i;
+ const char *wildcard_fieldname;
- if(Cmd_Argc() != 2)
+ if(Cmd_Argc() < 2 || Cmd_Argc() > 3)
{
- Con_Print("prvm_edicts <program name>\n");
+ Con_Print("prvm_edicts <program name> <optional field name wildcard>\n");
return;
}
if(!PRVM_SetProgFromString(Cmd_Argv(1)))
return;
+ if( Cmd_Argc() == 3)
+ wildcard_fieldname = Cmd_Argv(2);
+ else
+ wildcard_fieldname = NULL;
+
Con_Printf("%s: %i entities\n", PRVM_NAME, prog->num_edicts);
for (i=0 ; i<prog->num_edicts ; i++)
- PRVM_ED_PrintNum (i);
+ PRVM_ED_PrintNum (i, wildcard_fieldname);
PRVM_End;
}
void PRVM_ED_PrintEdict_f (void)
{
int i;
+ const char *wildcard_fieldname;
- if(Cmd_Argc() != 3)
+ if(Cmd_Argc() < 3 || Cmd_Argc() > 4)
{
- Con_Print("prvm_edict <program name> <edict number>\n");
+ Con_Print("prvm_edict <program name> <edict number> <optional field name wildcard>\n");
return;
}
PRVM_End;
return;
}
- PRVM_ED_PrintNum (i);
+ if( Cmd_Argc() == 4)
+ // Optional Wildcard Provided
+ wildcard_fieldname = Cmd_Argv(3);
+ else
+ // Use All
+ wildcard_fieldname = NULL;
+ PRVM_ED_PrintNum (i, wildcard_fieldname);
PRVM_End;
}
while (1)
{
// parse key
- if (!COM_ParseTokenConsole(&data))
+ if (!COM_ParseToken_Simple(&data, false, false))
PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
if (com_token[0] == '}')
break;
strlcpy (keyname, com_token, sizeof(keyname));
// parse value
- if (!COM_ParseTokenConsole(&data))
+ if (!COM_ParseToken_Simple(&data, false, true))
PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
if (com_token[0] == '}')
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);
while (i >= prog->max_edicts)
PRVM_MEM_IncreaseEdicts();
- //SV_IncreaseEdicts();
- // if SV_IncreaseEdicts was called the base pointer needs to be updated
+ // if IncreaseEdicts was called the base pointer needs to be updated
if (ent)
val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i));
while (1)
{
// parse key
- if (!COM_ParseTokenConsole(&data))
+ if (!COM_ParseToken_Simple(&data, false, false))
PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
if (developer_entityparsing.integer)
Con_Printf("Key: \"%s\"", com_token);
}
// parse value
- if (!COM_ParseTokenConsole(&data))
+ if (!COM_ParseToken_Simple(&data, false, true))
PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
if (developer_entityparsing.integer)
Con_Printf(" \"%s\"\n", com_token);
while (1)
{
// parse the opening brace
- if (!COM_ParseTokenConsole(&data))
+ if (!COM_ParseToken_Simple(&data, false, false))
break;
if (com_token[0] != '{')
PRVM_ERROR ("PRVM_ED_LoadFromFile: %s: found %s when expecting {", PRVM_NAME, com_token);
if (!handle)
{
Con_Print("No classname for:\n");
- PRVM_ED_Print(ent);
+ PRVM_ED_Print(ent, NULL);
PRVM_ED_Free (ent);
continue;
}
if (!func)
{
- if (developer.integer) // don't confuse non-developers with errors
+ // check for OnEntityNoSpawnFunction
+ if (prog->funcoffsets.SV_OnEntityNoSpawnFunction)
{
- Con_Print("No spawn function for:\n");
- PRVM_ED_Print(ent);
+ // 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");
+ }
+ else
+ {
+ if (developer.integer) // don't confuse non-developers with errors
+ {
+ Con_Print("No spawn function for:\n");
+ PRVM_ED_Print(ent, NULL);
+ }
+ PRVM_ED_Free (ent);
+ continue;
}
- PRVM_ED_Free (ent);
- continue;
}
-
- // self = ent
- PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
- PRVM_ExecuteProgram (func - prog->functions, "");
+ else
+ {
+ // self = ent
+ PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent);
+ PRVM_ExecuteProgram (func - prog->functions, "");
+ }
}
spawned++;
prog->fieldoffsets.items2 = PRVM_ED_FindFieldOffset("items2");
prog->fieldoffsets.lerpfrac = PRVM_ED_FindFieldOffset("lerpfrac");
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.netaddress = PRVM_ED_FindFieldOffset("netaddress");
prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
prog->funcoffsets.CSQC_Ent_Update = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
prog->funcoffsets.CSQC_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.SV_ChangeTeam = PRVM_ED_FindFunctionOffset("SV_ChangeTeam");
prog->funcoffsets.SV_ParseClientCommand = PRVM_ED_FindFunctionOffset("SV_ParseClientCommand");
prog->funcoffsets.SV_PlayerPhysics = PRVM_ED_FindFunctionOffset("SV_PlayerPhysics");
+ prog->funcoffsets.SV_OnEntityNoSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityNoSpawnFunction");
prog->funcoffsets.GameCommand = PRVM_ED_FindFunctionOffset("GameCommand");
prog->globaloffsets.SV_InitCmd = PRVM_ED_FindGlobalOffset("SV_InitCmd");
prog->globaloffsets.self = PRVM_ED_FindGlobalOffset("self");
prog->globaloffsets.v_forward = PRVM_ED_FindGlobalOffset("v_forward");
prog->globaloffsets.v_right = PRVM_ED_FindGlobalOffset("v_right");
prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up");
+ prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles");
prog->globaloffsets.trace_allsolid = PRVM_ED_FindGlobalOffset("trace_allsolid");
prog->globaloffsets.trace_startsolid = PRVM_ED_FindGlobalOffset("trace_startsolid");
prog->globaloffsets.trace_fraction = PRVM_ED_FindGlobalOffset("trace_fraction");
prog->globaloffsets.trace_dphitq3surfaceflags = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags");
prog->globaloffsets.trace_dphittexturename = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
prog->globaloffsets.trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
+ prog->globaloffsets.intermission = PRVM_ED_FindGlobalOffset("intermission");
+ prog->globaloffsets.coop = PRVM_ED_FindGlobalOffset("coop");
+ prog->globaloffsets.deathmatch = PRVM_ED_FindGlobalOffset("deathmatch");
+ prog->globaloffsets.dmg_take = PRVM_ED_FindGlobalOffset("dmg_take");
+ prog->globaloffsets.dmg_save = PRVM_ED_FindGlobalOffset("dmg_save");
+ prog->globaloffsets.dmg_origin = PRVM_ED_FindGlobalOffset("dmg_origin");
+ prog->globaloffsets.sb_showscores = PRVM_ED_FindGlobalOffset("sb_showscores");
+ prog->globaloffsets.drawfont = PRVM_ED_FindGlobalOffset("drawfont");
// menu qc only uses some functions, nothing else
- prog->funcoffsets.m_display = PRVM_ED_FindFunctionOffset("m_display");
prog->funcoffsets.m_draw = PRVM_ED_FindFunctionOffset("m_draw");
- prog->funcoffsets.m_hide = PRVM_ED_FindFunctionOffset("m_hide");
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");
PRVM_GCALL(reset_cmd)();
Mem_FreePool(&prog->progs_mempool);
memset(prog,0,sizeof(prvm_prog_t));
+ prog->starttime = Sys_DoubleTime();
}
/*
//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 = 0;
- for (i = 0;i < prog->progs->numstrings;i++)
- {
- if (prog->progs->ofs_strings + prog->stringssize >= (int)filesize)
- PRVM_ERROR ("%s: %s strings go past end of file", PRVM_NAME, filename);
- prog->stringssize += (int)strlen (prog->strings + prog->stringssize) + 1;
- }
+ prog->stringssize = prog->progs->numstrings;
+
prog->numknownstrings = 0;
prog->maxknownstrings = 0;
prog->knownstrings = NULL;
void PRVM_Globals_f (void)
{
int i;
+ const char *wildcard;
+ int numculled;
+ numculled = 0;
// TODO
/*if (!sv.active)
{
Con_Print("no progs loaded\n");
return;
}*/
- if(Cmd_Argc () != 2)
+ if(Cmd_Argc () < 2 || Cmd_Argc() > 3)
{
- Con_Print("prvm_globals <program name>\n");
+ Con_Print("prvm_globals <program name> <optional name wildcard>\n");
return;
}
if(!PRVM_SetProgFromString (Cmd_Argv (1)))
return;
+ if( Cmd_Argc() == 3)
+ wildcard = Cmd_Argv(2);
+ else
+ wildcard = NULL;
+
Con_Printf("%s :", PRVM_NAME);
for (i = 0;i < prog->progs->numglobaldefs;i++)
+ {
+ if(wildcard)
+ if( !matchpattern( PRVM_GetString(prog->globaldefs[i].s_name), wildcard, 1) )
+ {
+ numculled++;
+ continue;
+ }
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);
+ }
+ Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->progs->numglobals, numculled, prog->progs->numglobals * 4);
PRVM_End;
}
Cmd_AddCommand ("prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)");
+ Cmd_AddCommand ("prvm_callprofile", PRVM_CallProfile_f, "prints execution statistics about the most time consuming QuakeC calls from the engine in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_fields", PRVM_Fields_f, "prints usage statistics on properties (how many entities have non-zero values) in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)");
Cmd_AddCommand ("prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)");
PRVM_ResetProg();
memset(prog, 0, sizeof(prvm_prog_t));
+ prog->starttime = Sys_DoubleTime();
prog->error_cmd = Host_Error;
}