]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_edict.c
remove unused variable
[xonotic/darkplaces.git] / prvm_edict.c
index 49fa7420320d8a2900bd159007e583640cdf5be3..3f54cbebe1ddfccb51cf56ed9a5b9a8774f6778f 100644 (file)
@@ -17,9 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// AK new vm 
+// AK new vm
 
 #include "quakedef.h"
+#include "progsvm.h"
 
 prvm_prog_t *prog;
 
@@ -50,25 +51,27 @@ void PRVM_MEM_Alloc()
 {
        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)); 
+       prog->edictprivate_size = max(prog->edictprivate_size,(int)sizeof(prvm_edict_private_t));
 
        // alloc edicts
-       prog->edicts = Mem_Alloc(prog->edicts_mempool,prog->limit_edicts * sizeof(prvm_edict_t));
-       
+       prog->edicts = Mem_Alloc(prog->progs_mempool,prog->limit_edicts * sizeof(prvm_edict_t));
+
        // alloc edict private space
-       prog->edictprivate = Mem_Alloc(prog->edicts_mempool, prog->max_edicts * prog->edictprivate_size);
-       
+       prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size);
+
        // alloc edict fields
-       prog->edictsfields = Mem_Alloc(prog->edicts_mempool, prog->max_edicts * prog->edict_size);
+       prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size);
 
        // set edict pointers
        for(i = 0; i < prog->max_edicts; i++)
        {
-               prog->edicts[i].e = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
+               prog->edicts[i].p.e = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
                prog->edicts[i].v = (void*)((qbyte *)prog->edictsfields + i * prog->edict_size);
        }
 }
@@ -81,20 +84,20 @@ PRVM_MEM_IncreaseEdicts
 void PRVM_MEM_IncreaseEdicts()
 {
        int             i;
-       int             oldmaxedicts = prog->max_edicts; 
+       int             oldmaxedicts = prog->max_edicts;
        void    *oldedictsfields = prog->edictsfields;
        void    *oldedictprivate = prog->edictprivate;
-       
+
        if(prog->max_edicts >= prog->limit_edicts)
                return;
-       
+
        PRVM_GCALL(begin_increase_edicts)();
 
        // increase edicts
        prog->max_edicts = min(prog->max_edicts + 256, prog->limit_edicts);
 
-       prog->edictsfields = Mem_Alloc(prog->edicts_mempool, prog->max_edicts * prog->edict_size);
-       prog->edictprivate = Mem_Alloc(prog->edicts_mempool, prog->max_edicts * prog->edictprivate_size);
+       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);
@@ -102,7 +105,7 @@ void PRVM_MEM_IncreaseEdicts()
        //set e and v pointers
        for(i = 0; i < prog->max_edicts; i++)
        {
-               prog->edicts[i].e = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
+               prog->edicts[i].p.e = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
                prog->edicts[i].v = (void*)((qbyte *)prog->edictsfields + i * prog->edict_size);
        }
 
@@ -168,7 +171,7 @@ PRVM_SetProg
 void PRVM_SetProg(int prognr)
 {
        if(prognr && prognr < PRVM_MAXPROGS)
-       {       
+       {
                if(prog_list[prognr].loaded)
                        prog = &prog_list[prognr];
                else
@@ -189,12 +192,12 @@ void PRVM_ED_ClearEdict (prvm_edict_t *e)
 {
        int num;
        memset (e->v, 0, prog->progs->entityfields * 4);
-       e->e->free = false;
+       e->p.e->free = false;
        // LordHavoc: for consistency set these here
        num = PRVM_NUM_FOR_EDICT(e) - 1;
 
        // AK: Let the init_edict function determine if something needs to be initialized
-       PRVM_GCALL(init_edict)(num);    
+       PRVM_GCALL(init_edict)(num);
 }
 
 /*
@@ -216,14 +219,14 @@ prvm_edict_t *PRVM_ED_Alloc (void)
        // 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->p.e->free && ( e->p.e->freetime < 2 || (*prog->time - e->p.e->freetime) > 0.5 ) )
                {
                        PRVM_ED_ClearEdict (e);
                        return e;
@@ -253,10 +256,14 @@ FIXME: walk all entities and NULL out references to this entity
 */
 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->p.e->free = true;
+       ed->p.e->freetime = *prog->time;
 }
 
 //===========================================================================
@@ -377,7 +384,7 @@ char *PRVM_ValueString (etype_t type, prvm_eval_t *val)
        switch (type)
        {
        case ev_string:
-               sprintf (line, "%s", PRVM_GetString(val->string));
+               strlcpy (line, PRVM_GetString (val->string), sizeof (line));
                break;
        case ev_entity:
                n = val->edict;
@@ -431,9 +438,9 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
        char *s;
        ddef_t *def;
        mfunction_t *f;
-       
+
        type &= ~DEF_SAVEGLOBAL;
-       
+
        switch (type)
        {
        case ev_string:
@@ -460,30 +467,30 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
                line[i] = '\0';
                break;
        case ev_entity:
-               snprintf (line, sizeof (line), "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
+               dpsnprintf (line, sizeof (line), "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
                break;
        case ev_function:
                f = pr_functions + val->function;
-               snprintf (line, sizeof (line), "%s", PRVM_GetString(f->s_name));
+               strlcpy (line, PRVM_GetString (f->s_name), sizeof (line));
                break;
        case ev_field:
                def = PRVM_ED_FieldAtOfs ( val->_int );
-               snprintf (line, sizeof (line), ".%s", PRVM_GetString(def->s_name));
+               dpsnprintf (line, sizeof (line), ".%s", PRVM_GetString(def->s_name));
                break;
        case ev_void:
-               snprintf (line, sizeof (line), "void");
+               dpsnprintf (line, sizeof (line), "void");
                break;
        case ev_float:
-               snprintf (line, sizeof (line), "%f", val->_float);
+               dpsnprintf (line, sizeof (line), "%f", val->_float);
                break;
        case ev_vector:
-               snprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
+               dpsnprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
                break;
        default:
-               snprintf (line, sizeof (line), "bad type %i", type);
+               dpsnprintf (line, sizeof (line), "bad type %i", type);
                break;
        }
-       
+
        return line;
 }
 
@@ -551,7 +558,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)
 {
        int             l;
        ddef_t  *d;
@@ -561,9 +568,9 @@ void PRVM_ED_Print (prvm_edict_t *ed)
        int             type;
        char    tempstring[8192], tempstring2[260]; // temporary string buffers
 
-       if (ed->e->free)
+       if (ed->p.e->free)
        {
-               Con_Printf ("%s: FREE\n",PRVM_NAME);
+               Con_Printf("%s: FREE\n",PRVM_NAME);
                return;
        }
 
@@ -589,7 +596,7 @@ void PRVM_ED_Print (prvm_edict_t *ed)
 
                if (strlen(name) > 256)
                {
-                       strncpy(tempstring2, name, 256);
+                       memcpy (tempstring2, name, 256);
                        tempstring2[256] = tempstring2[257] = tempstring2[258] = '.';
                        tempstring2[259] = 0;
                        name = tempstring2;
@@ -602,7 +609,7 @@ void PRVM_ED_Print (prvm_edict_t *ed)
                name = PRVM_ValueString(d->type, (prvm_eval_t *)v);
                if (strlen(name) > 256)
                {
-                       strncpy(tempstring2, name, 256);
+                       memcpy (tempstring2, name, 256);
                        tempstring2[256] = tempstring2[257] = tempstring2[258] = '.';
                        tempstring2[259] = 0;
                        name = tempstring2;
@@ -611,12 +618,12 @@ void PRVM_ED_Print (prvm_edict_t *ed)
                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);
 }
 
 /*
@@ -634,11 +641,11 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
        char    *name;
        int             type;
 
-       FS_Print(f, "{\n");
+       FS_Print(f, "{\n");
 
-       if (ed->e->free)
+       if (ed->p.e->free)
        {
-               FS_Print(f, "}\n");
+               FS_Print(f, "}\n");
                return;
        }
 
@@ -659,16 +666,16 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
                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_Print(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));
 }
 
 /*
@@ -687,12 +694,12 @@ void PRVM_ED_PrintEdicts_f (void)
                Con_Print("prvm_edicts <program name>\n");
                return;
        }
-       
+
        PRVM_Begin;
        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);
 
@@ -723,7 +730,7 @@ void PRVM_ED_PrintEdict_f (void)
        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;
        }
@@ -765,13 +772,13 @@ void PRVM_ED_Count_f (void)
                for (i=0 ; i<prog->num_edicts ; i++)
                {
                        ent = PRVM_EDICT_NUM(i);
-                       if (ent->e->free)
+                       if (ent->p.e->free)
                                continue;
                        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;
@@ -798,7 +805,7 @@ void PRVM_ED_WriteGlobals (qfile_t *f)
        char            *name;
        int                     type;
 
-       FS_Print(f,"{\n");
+       FS_Print(f,"{\n");
        for (i=0 ; i<prog->progs->numglobaldefs ; i++)
        {
                def = &prog->globaldefs[i];
@@ -811,10 +818,10 @@ void PRVM_ED_WriteGlobals (qfile_t *f)
                        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_Print(f,"}\n");
+       FS_Print(f,"}\n");
 }
 
 /*
@@ -847,7 +854,7 @@ void PRVM_ED_ParseGlobals (const char *data)
                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;
                }
 
@@ -870,7 +877,7 @@ char *PRVM_ED_NewString (const char *string)
        int i,l;
 
        l = strlen(string) + 1;
-       new = Mem_Alloc(prog->edictstring_mempool, l);
+       new = Mem_Alloc(prog->progs_mempool, l);
        new_p = new;
 
        for (i=0 ; i< l ; i++)
@@ -890,7 +897,6 @@ char *PRVM_ED_NewString (const char *string)
        return new;
 }
 
-
 /*
 =============
 PRVM_ED_ParseEval
@@ -909,11 +915,11 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
        if (ent)
                val = (prvm_eval_t *)((int *)ent->v + key->ofs);
        else
-               val = (prvm_eval_t *)((int *)pr_globals + key->ofs);
+               val = (prvm_eval_t *)((int *)prog->globals + key->ofs);
        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:
@@ -956,17 +962,17 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
                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);
+               val->_int = def->ofs;
                break;
 
        case ev_function:
                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;
@@ -979,6 +985,41 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
        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));
+       else
+               PRVM_ED_ParseEpair(ed, key, Cmd_Argv(4));
+
+       PRVM_End;
+}
+
 /*
 ====================
 PRVM_ED_ParseEdict
@@ -998,10 +1039,6 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
 
        init = false;
 
-// clear it
-       if (ent != prog->edicts)        // hack
-               memset (ent->v, 0, prog->progs->entityfields * 4);
-
 // go through all the dictionary pairs
        while (1)
        {
@@ -1027,7 +1064,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
 
                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] == ' ')
                {
@@ -1052,7 +1089,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
                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;
                }
 
@@ -1068,7 +1105,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
        }
 
        if (!init)
-               ent->e->free = true;
+               ent->p.e->free = true;
 
        return data;
 }
@@ -1095,16 +1132,12 @@ void PRVM_ED_LoadFromFile (const char *data)
        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)
        {
@@ -1112,12 +1145,18 @@ void PRVM_ED_LoadFromFile (const char *data)
                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 ();
+                       ent = PRVM_ED_Alloc();
+
+               // clear it
+               if (ent != prog->edicts)        // hack
+                       memset (ent->v, 0, prog->progs->entityfields * 4);
+
                data = PRVM_ED_ParseEdict (data, ent);
                parsed++;
 
@@ -1130,44 +1169,44 @@ void PRVM_ED_LoadFromFile (const char *data)
                }
 
 //
-// 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_Print("No classname for:\n");
-                               PRVM_ED_Print (ent);
+                               Con_Print("No classname for:\n");
+                               PRVM_ED_Print(ent);
                                PRVM_ED_Free (ent);
                                continue;
                        }
-                       
+
                        // look for the spawn function
                        func = PRVM_ED_FindFunction (PRVM_GetString(handle));
-                       
+
                        if (!func)
                        {
                                if (developer.integer) // don't confuse non-developers with errors
                                {
-                                       Con_Print("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;
                        }
-                       
+
                        // self = ent
                        PRVM_G_INT(prog->self->ofs) = PRVM_EDICT_TO_PROG(ent);
                        PRVM_ExecuteProgram (func - prog->functions, "");
                }
-       
+
                spawned++;
-               if (ent->e->free)
+               if (ent->p.e->free)
                        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
@@ -1194,22 +1233,18 @@ PRVM_ResetProg
 
 void PRVM_ResetProg()
 {
-       mempool_t *t1, *t2, *t3;
+       /*mempool_t *t1;
 
        t1 = prog->progs_mempool;
-       t2 = prog->edictstring_mempool;
-       t3 = prog->edicts_mempool;
-       
-       Mem_EmptyPool(prog->progs_mempool);
-       Mem_EmptyPool(prog->edictstring_mempool);
-       Mem_EmptyPool(prog->edicts_mempool);
-       
+
+       Mem_EmptyPool(prog->progs_mempool);*/
+       Mem_FreePool(&prog->progs_mempool);
+
        memset(prog,0,sizeof(prvm_prog_t));
-       
-       
-       prog->progs_mempool = t1;
-       prog->edictstring_mempool = t2;
-       prog->edicts_mempool = t3;
+
+       /*prog->time = &prog->_time;
+
+       prog->progs_mempool = t1;*/
 
        PRVM_GCALL(reset_cmd)();
 }
@@ -1224,22 +1259,15 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
        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);
 
@@ -1436,27 +1464,28 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
        PRVM_Init_Exec();
 
        prog->loaded = TRUE;
-       
+
        // set flags & ddef_ts in prog
-       
+
        prog->flag = 0;
-       
+
        prog->self = PRVM_ED_FindGlobal("self");
 
-       if(PRVM_ED_FindGlobal("time"))
-               prog->flag |= PRVM_GE_TIME;
+       if( PRVM_ED_FindGlobal("time") && PRVM_ED_FindGlobal("time")->type & ev_float )
+               prog->time = &PRVM_G_FLOAT(PRVM_ED_FindGlobal("time")->ofs);
 
        if(PRVM_ED_FindField ("chain"))
                prog->flag |= PRVM_FE_CHAIN;
 
        if(PRVM_ED_FindField ("classname"))
-               prog->flag |= PRVM_FE_CLASSNAME; 
+               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) 
+       if(PRVM_ED_FindField ("nextthink") && PRVM_ED_FindField ("frame") && PRVM_ED_FindField ("think")
+               && prog->flag && prog->self)
                prog->flag |= PRVM_OP_STATE;
-       
+
        PRVM_GCALL(reset_cmd)();
+       PRVM_GCALL(init_cmd)();
 
        // init mempools
        PRVM_MEM_Alloc();
@@ -1476,7 +1505,7 @@ void PRVM_Fields_f (void)
        /*
        if (!sv.active)
        {
-               Con_Printf("no progs loaded\n");
+               Con_Print("no progs loaded\n");
                return;
        }
        */
@@ -1495,7 +1524,7 @@ void PRVM_Fields_f (void)
        for (ednum = 0;ednum < prog->max_edicts;ednum++)
        {
                ed = PRVM_EDICT_NUM(ednum);
-               if (ed->e->free)
+               if (ed->p.e->free)
                        continue;
                for (i = 1;i < prog->progs->numfielddefs;i++)
                {
@@ -1557,7 +1586,7 @@ void PRVM_Fields_f (void)
                }
                if (strlen(name) > 256)
                {
-                       strncpy(tempstring2, name, 256);
+                       memcpy (tempstring2, name, 256);
                        tempstring2[256] = tempstring2[257] = tempstring2[258] = '.';
                        tempstring2[259] = 0;
                        name = tempstring2;
@@ -1570,7 +1599,7 @@ void PRVM_Fields_f (void)
                strcat(tempstring, "\n");
                if (strlen(tempstring) >= 4096)
                {
-                       Con_Printf("%s", tempstring);
+                       Con_Print(tempstring);
                        tempstring[0] = 0;
                }
                if (counts[i])
@@ -1591,12 +1620,12 @@ void PRVM_Globals_f (void)
        // 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;
        }
 
@@ -1613,6 +1642,56 @@ void PRVM_Globals_f (void)
        PRVM_End;
 }
 
+/*
+===============
+PRVM_Global
+===============
+*/
+void PRVM_Global_f(void)
+{
+       ddef_t *global;
+       if( Cmd_Argc() != 3 ) {
+               Con_Printf( "prvm_global <program name> <global name>\n" );
+               return;
+       }
+
+       PRVM_Begin;
+       if( !PRVM_SetProgFromString( Cmd_Argv(1) ) )
+               return;
+
+       global = PRVM_ED_FindGlobal( 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( global->type, (prvm_eval_t *) &prog->globals[ global->ofs ] ) );
+       PRVM_End;
+}
+
+/*
+===============
+PRVM_GlobalSet
+===============
+*/
+void PRVM_GlobalSet_f(void)
+{
+       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) ) )
+               return;
+
+       global = PRVM_ED_FindGlobal( 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) );
+       PRVM_End;
+}
+
 /*
 ===============
 PRVM_Init
@@ -1626,6 +1705,9 @@ void PRVM_Init (void)
        Cmd_AddCommand ("prvm_profile", PRVM_Profile_f);
        Cmd_AddCommand ("prvm_fields", PRVM_Fields_f);
        Cmd_AddCommand ("prvm_globals", PRVM_Globals_f);
+       Cmd_AddCommand ("prvm_global", PRVM_Global_f);
+       Cmd_AddCommand ("prvm_globalset", PRVM_GlobalSet_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);
@@ -1645,9 +1727,12 @@ void PRVM_InitProg(int prognr)
 
        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()