]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_edict.c
Gecko resizing support
[xonotic/darkplaces.git] / prvm_edict.c
index 368196dfce491737cde8e32fa65fb6aa7dac7aca..64fae58b56e94fa49b7d2ad711f231d0745bc25f 100644 (file)
@@ -38,6 +38,8 @@ cvar_t prvm_traceqc = {0, "prvm_traceqc", "0", "prints every QuakeC statement as
 // 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)"};
 
+extern sizebuf_t vm_tempstringsbuf;
+
 //============================================================================
 // mempool handling
 
@@ -123,7 +125,7 @@ int PRVM_ED_FindFieldOffset(const char *field)
        d = PRVM_ED_FindField(field);
        if (!d)
                return -1;
-       return d->ofs*4;
+       return d->ofs;
 }
 
 int PRVM_ED_FindGlobalOffset(const char *global)
@@ -132,7 +134,7 @@ int PRVM_ED_FindGlobalOffset(const char *global)
        d = PRVM_ED_FindGlobal(global);
        if (!d)
                return -1;
-       return d->ofs*4;
+       return d->ofs;
 }
 
 func_t PRVM_ED_FindFunctionOffset(const char *function)
@@ -572,7 +574,7 @@ For debugging
 */
 // 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;
@@ -597,6 +599,12 @@ void PRVM_ED_Print(prvm_edict_t *ed)
                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
@@ -687,9 +695,9 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
        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);
 }
 
 /*
@@ -702,10 +710,11 @@ For debugging, prints all the entities in the current server
 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;
        }
 
@@ -713,9 +722,14 @@ void PRVM_ED_PrintEdicts_f (void)
        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;
 }
@@ -730,10 +744,11 @@ For debugging, prints a single edict
 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;
        }
 
@@ -748,7 +763,13 @@ void PRVM_ED_PrintEdict_f (void)
                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;
 }
@@ -851,7 +872,7 @@ void PRVM_ED_ParseGlobals (const char *data)
        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;
@@ -859,7 +880,7 @@ void PRVM_ED_ParseGlobals (const char *data)
                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] == '}')
@@ -951,8 +972,7 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
                        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));
@@ -985,6 +1005,71 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
        return true;
 }
 
+/*
+=============
+PRVM_GameCommand_f
+
+Console command to send a string to QC function GameCommand of the
+indicated progs
+
+Usage:
+  sv_cmd adminmsg 3 "do not teamkill"
+  cl_cmd someclientcommand
+  menu_cmd somemenucommand
+
+All progs can support this extension; sg calls it in server QC, cg in client
+QC, mg in menu QC.
+=============
+*/
+void PRVM_GameCommand(const char *whichprogs, const char *whichcmd)
+{
+       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);
+               return;
+       }
+
+       if(!prog->funcoffsets.GameCommand)
+       {
+               Con_Printf("%s program do not support GameCommand!\n", whichprogs);
+       }
+       else
+       {
+               int restorevm_tempstringsbuf_cursize;
+               const char *s;
+
+               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;
+       }
+
+       PRVM_End;
+}
+void PRVM_GameCommand_Server_f(void)
+{
+       PRVM_GameCommand("server", "sv_cmd");
+}
+void PRVM_GameCommand_Client_f(void)
+{
+       PRVM_GameCommand("client", "cl_cmd");
+}
+void PRVM_GameCommand_Menu_f(void)
+{
+       PRVM_GameCommand("menu", "menu_cmd");
+}
+
 /*
 =============
 PRVM_ED_EdictSet_f
@@ -1044,7 +1129,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
        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);
@@ -1076,7 +1161,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
                }
 
        // 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);
@@ -1151,7 +1236,7 @@ void PRVM_ED_LoadFromFile (const char *data)
        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);
@@ -1185,11 +1270,11 @@ void PRVM_ED_LoadFromFile (const char *data)
 //
                if(prog->globaloffsets.self >= 0 && prog->fieldoffsets.classname >= 0)
                {
-                       string_t handle =  *(string_t*)&((unsigned char*)ent->fields.vp)[prog->fieldoffsets.classname];
+                       string_t handle =  PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.classname)->string;
                        if (!handle)
                        {
                                Con_Print("No classname for:\n");
-                               PRVM_ED_Print(ent);
+                               PRVM_ED_Print(ent, NULL);
                                PRVM_ED_Free (ent);
                                continue;
                        }
@@ -1199,18 +1284,30 @@ void PRVM_ED_LoadFromFile (const char *data)
 
                        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++;
@@ -1229,136 +1326,150 @@ void PRVM_FindOffsets(void)
        // functions use 0 for NULL
        memset(&prog->funcoffsets, 0, sizeof(prog->funcoffsets));
 
-       // common
-       prog->fieldoffsets.classname = PRVM_ED_FindFieldOffset("classname");
-       prog->fieldoffsets.chain = PRVM_ED_FindFieldOffset("chain");
-       prog->fieldoffsets.think = PRVM_ED_FindFieldOffset("think");
-       prog->fieldoffsets.nextthink = PRVM_ED_FindFieldOffset("nextthink");
-       prog->fieldoffsets.frame = PRVM_ED_FindFieldOffset("frame");
-       prog->fieldoffsets.angles = PRVM_ED_FindFieldOffset("angles");
-       prog->globaloffsets.self = PRVM_ED_FindGlobalOffset("self");
-       prog->globaloffsets.time = PRVM_ED_FindGlobalOffset("time");
-
-       // ssqc
-       prog->fieldoffsets.gravity = PRVM_ED_FindFieldOffset("gravity");
-       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.buttonuse = PRVM_ED_FindFieldOffset("buttonuse");
-       prog->fieldoffsets.buttonchat = PRVM_ED_FindFieldOffset("buttonchat");
-       prog->fieldoffsets.glow_size = PRVM_ED_FindFieldOffset("glow_size");
-       prog->fieldoffsets.glow_trail = PRVM_ED_FindFieldOffset("glow_trail");
-       prog->fieldoffsets.glow_color = PRVM_ED_FindFieldOffset("glow_color");
-       prog->fieldoffsets.items2 = PRVM_ED_FindFieldOffset("items2");
-       prog->fieldoffsets.scale = PRVM_ED_FindFieldOffset("scale");
-       prog->fieldoffsets.alpha = PRVM_ED_FindFieldOffset("alpha");
-       prog->fieldoffsets.renderamt = PRVM_ED_FindFieldOffset("renderamt"); // HalfLife support
-       prog->fieldoffsets.rendermode = PRVM_ED_FindFieldOffset("rendermode"); // HalfLife support
-       prog->fieldoffsets.fullbright = PRVM_ED_FindFieldOffset("fullbright");
-       prog->fieldoffsets.ammo_shells1 = PRVM_ED_FindFieldOffset("ammo_shells1");
-       prog->fieldoffsets.ammo_nails1 = PRVM_ED_FindFieldOffset("ammo_nails1");
-       prog->fieldoffsets.ammo_lava_nails = PRVM_ED_FindFieldOffset("ammo_lava_nails");
-       prog->fieldoffsets.ammo_rockets1 = PRVM_ED_FindFieldOffset("ammo_rockets1");
-       prog->fieldoffsets.ammo_multi_rockets = PRVM_ED_FindFieldOffset("ammo_multi_rockets");
-       prog->fieldoffsets.ammo_cells1 = PRVM_ED_FindFieldOffset("ammo_cells1");
-       prog->fieldoffsets.ammo_plasma = PRVM_ED_FindFieldOffset("ammo_plasma");
-       prog->fieldoffsets.ideal_yaw = PRVM_ED_FindFieldOffset("ideal_yaw");
-       prog->fieldoffsets.yaw_speed = PRVM_ED_FindFieldOffset("yaw_speed");
-       prog->fieldoffsets.idealpitch = PRVM_ED_FindFieldOffset("idealpitch");
-       prog->fieldoffsets.pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed");
-       prog->fieldoffsets.viewmodelforclient = PRVM_ED_FindFieldOffset("viewmodelforclient");
-       prog->fieldoffsets.nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient");
-       prog->fieldoffsets.exteriormodeltoclient = PRVM_ED_FindFieldOffset("exteriormodeltoclient");
-       prog->fieldoffsets.drawonlytoclient = PRVM_ED_FindFieldOffset("drawonlytoclient");
-       prog->fieldoffsets.ping = PRVM_ED_FindFieldOffset("ping");
-       prog->fieldoffsets.movement = PRVM_ED_FindFieldOffset("movement");
-       prog->fieldoffsets.pmodel = PRVM_ED_FindFieldOffset("pmodel");
-       prog->fieldoffsets.punchvector = PRVM_ED_FindFieldOffset("punchvector");
-       prog->fieldoffsets.viewzoom = PRVM_ED_FindFieldOffset("viewzoom");
-       prog->fieldoffsets.clientcolors = PRVM_ED_FindFieldOffset("clientcolors");
-       prog->fieldoffsets.tag_entity = PRVM_ED_FindFieldOffset("tag_entity");
-       prog->fieldoffsets.tag_index = PRVM_ED_FindFieldOffset("tag_index");
-       prog->fieldoffsets.light_lev = PRVM_ED_FindFieldOffset("light_lev");
-       prog->fieldoffsets.color = PRVM_ED_FindFieldOffset("color");
-       prog->fieldoffsets.style = PRVM_ED_FindFieldOffset("style");
-       prog->fieldoffsets.pflags = PRVM_ED_FindFieldOffset("pflags");
-       prog->fieldoffsets.cursor_active = PRVM_ED_FindFieldOffset("cursor_active");
-       prog->fieldoffsets.cursor_screen = PRVM_ED_FindFieldOffset("cursor_screen");
-       prog->fieldoffsets.cursor_trace_start = PRVM_ED_FindFieldOffset("cursor_trace_start");
-       prog->fieldoffsets.cursor_trace_endpos = PRVM_ED_FindFieldOffset("cursor_trace_endpos");
-       prog->fieldoffsets.cursor_trace_ent = PRVM_ED_FindFieldOffset("cursor_trace_ent");
-       prog->fieldoffsets.colormod = PRVM_ED_FindFieldOffset("colormod");
-       prog->fieldoffsets.playermodel = PRVM_ED_FindFieldOffset("playermodel");
-       prog->fieldoffsets.playerskin = PRVM_ED_FindFieldOffset("playerskin");
-       prog->fieldoffsets.SendEntity = PRVM_ED_FindFieldOffset("SendEntity");
-       prog->fieldoffsets.Version = PRVM_ED_FindFieldOffset("Version");
-       prog->fieldoffsets.customizeentityforclient = PRVM_ED_FindFieldOffset("customizeentityforclient");
-       prog->fieldoffsets.dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask");
-       prog->fieldoffsets.contentstransition = PRVM_ED_FindFieldOffset("contentstransition");
-       prog->globaloffsets.trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
-       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.SV_InitCmd = PRVM_ED_FindGlobalOffset("SV_InitCmd");
-       prog->funcoffsets.SV_ParseClientCommand = PRVM_ED_FindFunctionOffset("SV_ParseClientCommand");
-       prog->funcoffsets.SV_PlayerPhysics = PRVM_ED_FindFunctionOffset("SV_PlayerPhysics");
-       prog->funcoffsets.SV_ChangeTeam = PRVM_ED_FindFunctionOffset("SV_ChangeTeam");
-       prog->funcoffsets.EndFrame = PRVM_ED_FindFunctionOffset("EndFrame");
-       prog->funcoffsets.RestoreGame = PRVM_ED_FindFunctionOffset("RestoreGame");
-
-       // csqc
-       prog->fieldoffsets.alpha = PRVM_ED_FindFieldOffset("alpha");
-       prog->fieldoffsets.scale = PRVM_ED_FindFieldOffset("scale");
-       //prog->fieldoffsets.fatness = PRVM_ED_FindFieldOffset("fatness");
-       prog->fieldoffsets.frame2 = PRVM_ED_FindFieldOffset("frame2");
-       prog->fieldoffsets.frame1time = PRVM_ED_FindFieldOffset("frame1time");
-       prog->fieldoffsets.frame2time = PRVM_ED_FindFieldOffset("frame2time");
-       prog->fieldoffsets.lerpfrac = PRVM_ED_FindFieldOffset("lerpfrac");
-       prog->fieldoffsets.renderflags = PRVM_ED_FindFieldOffset("renderflags");
-       //prog->fieldoffsets.forceshader = PRVM_ED_FindFieldOffset("forceshader");
-       //prog->fieldoffsets.dimension_hit = PRVM_ED_FindFieldOffset("dimension_hit");
-       //prog->fieldoffsets.dimension_solid = PRVM_ED_FindFieldOffset("dimension_solid");
-       //prog->fieldoffsets.groundentity = PRVM_ED_FindFieldOffset("groundentity");
-       //prog->fieldoffsets.hull = PRVM_ED_FindFieldOffset("hull");
-       prog->fieldoffsets.colormod = PRVM_ED_FindFieldOffset("colormod");
-       prog->fieldoffsets.effects = PRVM_ED_FindFieldOffset("effects");
-       prog->fieldoffsets.tag_entity = PRVM_ED_FindFieldOffset("tag_entity");
-       prog->fieldoffsets.tag_index = PRVM_ED_FindFieldOffset("tag_index");
-       prog->funcoffsets.CSQC_Init = PRVM_ED_FindFunctionOffset("CSQC_Init");
-       prog->funcoffsets.CSQC_InputEvent = PRVM_ED_FindFunctionOffset("CSQC_InputEvent");
-       prog->funcoffsets.CSQC_UpdateView = PRVM_ED_FindFunctionOffset("CSQC_UpdateView");
-       prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
-       prog->funcoffsets.CSQC_Shutdown = PRVM_ED_FindFunctionOffset("CSQC_Shutdown");
-       prog->funcoffsets.CSQC_Parse_TempEntity = PRVM_ED_FindFunctionOffset("CSQC_Parse_TempEntity");
-       prog->funcoffsets.CSQC_Parse_StuffCmd = PRVM_ED_FindFunctionOffset("CSQC_Parse_StuffCmd");
-       prog->funcoffsets.CSQC_Parse_Print = PRVM_ED_FindFunctionOffset("CSQC_Parse_Print");
-       prog->funcoffsets.CSQC_Parse_CenterPrint = PRVM_ED_FindFunctionOffset("CSQC_Parse_CenterPrint");
-       prog->funcoffsets.CSQC_Ent_Update = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
-       prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
-       prog->funcoffsets.CSQC_Event = PRVM_ED_FindFunctionOffset("CSQC_Event");
-
-       // mqc
-       prog->funcoffsets.m_init = PRVM_ED_FindFunctionOffset("m_init");
-#ifdef NG_MENU
-       prog->funcoffsets.m_display = PRVM_ED_FindFunctionOffset("m_display");
-       prog->funcoffsets.m_hide = PRVM_ED_FindFunctionOffset("m_hide");
-#endif
-       prog->funcoffsets.m_keydown = PRVM_ED_FindFunctionOffset("m_keydown");
-       prog->funcoffsets.m_keyup = PRVM_ED_FindFunctionOffset("m_keyup");
-       prog->funcoffsets.m_draw = PRVM_ED_FindFunctionOffset("m_draw");
-       prog->funcoffsets.m_toggle = PRVM_ED_FindFunctionOffset("m_toggle");
-       prog->funcoffsets.m_shutdown = PRVM_ED_FindFunctionOffset("m_shutdown");
+       // server and client qc use a lot of similar fields, so this is combined
+       prog->fieldoffsets.SendEntity                     = PRVM_ED_FindFieldOffset("SendEntity");
+       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.clientcolors                   = PRVM_ED_FindFieldOffset("clientcolors");
+       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.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.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.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->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.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->funcoffsets.CSQC_ConsoleCommand             = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
+       prog->funcoffsets.CSQC_Ent_Remove                 = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
+       prog->funcoffsets.CSQC_Ent_Update                 = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
+       prog->funcoffsets.CSQC_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.RestoreGame                     = PRVM_ED_FindFunctionOffset("RestoreGame");
+       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.time                          = PRVM_ED_FindGlobalOffset("time");
+       prog->globaloffsets.v_forward                     = PRVM_ED_FindGlobalOffset("v_forward");
+       prog->globaloffsets.v_right                       = PRVM_ED_FindGlobalOffset("v_right");
+       prog->globaloffsets.v_up                          = PRVM_ED_FindGlobalOffset("v_up");
+       prog->globaloffsets.view_angles                   = PRVM_ED_FindGlobalOffset("view_angles");
+       prog->globaloffsets.trace_allsolid                = PRVM_ED_FindGlobalOffset("trace_allsolid");
+       prog->globaloffsets.trace_startsolid              = PRVM_ED_FindGlobalOffset("trace_startsolid");
+       prog->globaloffsets.trace_fraction                = PRVM_ED_FindGlobalOffset("trace_fraction");
+       prog->globaloffsets.trace_inwater                 = PRVM_ED_FindGlobalOffset("trace_inwater");
+       prog->globaloffsets.trace_inopen                  = PRVM_ED_FindGlobalOffset("trace_inopen");
+       prog->globaloffsets.trace_endpos                  = PRVM_ED_FindGlobalOffset("trace_endpos");
+       prog->globaloffsets.trace_plane_normal            = PRVM_ED_FindGlobalOffset("trace_plane_normal");
+       prog->globaloffsets.trace_plane_dist              = PRVM_ED_FindGlobalOffset("trace_plane_dist");
+       prog->globaloffsets.trace_ent                     = PRVM_ED_FindGlobalOffset("trace_ent");
+       prog->globaloffsets.trace_dphitcontents           = PRVM_ED_FindGlobalOffset("trace_dphitcontents");
+       prog->globaloffsets.trace_dphitq3surfaceflags     = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags");
+       prog->globaloffsets.trace_dphittexturename        = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
+       prog->globaloffsets.trace_dpstartcontents         = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
+       prog->globaloffsets.intermission                  = PRVM_ED_FindGlobalOffset("intermission");
+       prog->globaloffsets.coop                          = PRVM_ED_FindGlobalOffset("coop");
+       prog->globaloffsets.deathmatch                    = PRVM_ED_FindGlobalOffset("deathmatch");
+       prog->globaloffsets.dmg_take                      = PRVM_ED_FindGlobalOffset("dmg_take");
+       prog->globaloffsets.dmg_save                      = PRVM_ED_FindGlobalOffset("dmg_save");
+       prog->globaloffsets.dmg_origin                    = PRVM_ED_FindGlobalOffset("dmg_origin");
+       prog->globaloffsets.sb_showscores                 = PRVM_ED_FindGlobalOffset("sb_showscores");
+       prog->globaloffsets.drawfont                      = PRVM_ED_FindGlobalOffset("drawfont");
+
+       // 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");
 }
 
 // not used
@@ -1388,6 +1499,7 @@ void PRVM_ResetProg()
        PRVM_GCALL(reset_cmd)();
        Mem_FreePool(&prog->progs_mempool);
        memset(prog,0,sizeof(prvm_prog_t));
+       prog->starttime = Sys_DoubleTime();
 }
 
 /*
@@ -1474,14 +1586,11 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
        //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;
@@ -1684,10 +1793,6 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
 
        PRVM_FindOffsets();
 
-       // check if OP_STATE animation is possible in this dat file
-       if (prog->fieldoffsets.nextthink >= 0 && prog->fieldoffsets.frame >= 0 && prog->fieldoffsets.think >= 0 && prog->globaloffsets.self >= 0)
-               prog->flag |= PRVM_OP_STATE;
-
        PRVM_GCALL(init_cmd)();
 
        // init mempools
@@ -1821,15 +1926,18 @@ void PRVM_Fields_f (void)
 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;
        }
 
@@ -1837,11 +1945,24 @@ void PRVM_Globals_f (void)
        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;
 }
@@ -1904,15 +2025,19 @@ PRVM_Init
 void PRVM_Init (void)
 {
        Cmd_AddCommand ("prvm_edict", PRVM_ED_PrintEdict_f, "print all data about an entity number in the selected VM (server, client, menu)");
-       Cmd_AddCommand ("prvm_edicts", PRVM_ED_PrintEdicts_f, "set a property on an entity number in the selected VM (server, client, menu)");
+       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)");
        Cmd_AddCommand ("prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)");
        Cmd_AddCommand ("prvm_edictset", PRVM_ED_EdictSet_f, "changes value of a specified property of a specified entity in the selected VM (server, client, menu)");
        Cmd_AddCommand ("prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)");
+       Cmd_AddCommand ("cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument");
+       Cmd_AddCommand ("menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
+       Cmd_AddCommand ("sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
        // LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
        Cvar_RegisterVariable (&prvm_boundscheck);
        Cvar_RegisterVariable (&prvm_traceqc);
@@ -1937,6 +2062,7 @@ void PRVM_InitProg(int prognr)
                PRVM_ResetProg();
 
        memset(prog, 0, sizeof(prvm_prog_t));
+       prog->starttime = Sys_DoubleTime();
 
        prog->error_cmd = Host_Error;
 }
@@ -2093,8 +2219,8 @@ int PRVM_SetEngineString(const char *s)
                if (prog->knownstrings[i] == s)
                        return -1 - i;
        // new unknown engine string
-       if (developer.integer >= 100)
-               Con_Printf("new engine string %p\n", s);
+       if (developer.integer >= 200)
+               Con_Printf("new engine string %p = \"%s\"\n", s, s);
        for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
                if (!prog->knownstrings[i])
                        break;