no longer throttles back framerate when console is active, now only when app is not...

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index 1bf6e847d85bfab4a73666299e39ac20a7f2efad..45f17c610dbca203da877c79b7c69c187521a41d 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -690,7 +690,7 @@ void PRVM_ED_PrintEdicts_f (void)
 
        if(Cmd_Argc() != 2)
        {
-               Con_Print("prvm_edicts <program name>\n");
+               Con_Printf("prvm_edicts <program name>\n");
                return;
        }
        
@@ -718,7 +718,7 @@ void PRVM_ED_PrintEdict_f (void)
 
        if(Cmd_Argc() != 3)
        {
-               Con_Print("prvm_edict <program name> <edict number>\n");
+               Con_Printf("prvm_edict <program name> <edict number>\n");
                return;
        }
 
@@ -755,7 +755,7 @@ void PRVM_ED_Count_f (void)
 
        if(Cmd_Argc() != 2)
        {
-               Con_Print("prvm_count <program name>\n");
+               Con_Printf("prvm_count <program name>\n");
                return;
        }
 
@@ -1134,7 +1134,7 @@ 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)
                {
@@ -1198,7 +1198,7 @@ PRVM_ResetProg
 
 void PRVM_ResetProg()
 {
-       mempool_t *t1, *t2, *t3;
+       /*mempool_t *t1, *t2, *t3;
 
        t1 = prog->progs_mempool;
        t2 = prog->edictstring_mempool;
@@ -1206,15 +1206,18 @@ void PRVM_ResetProg()
        
        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->time = &prog->_time;
        
        prog->progs_mempool = t1;
        prog->edictstring_mempool = t2;
-       prog->edicts_mempool = t3;
+       prog->edicts_mempool = t3;*/
 
        PRVM_GCALL(reset_cmd)();
 }
@@ -1462,6 +1465,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
                prog->flag |= PRVM_OP_STATE;
        
        PRVM_GCALL(reset_cmd)();
+       PRVM_GCALL(init_cmd)();
 
        // init mempools
        PRVM_MEM_Alloc();
@@ -1488,7 +1492,7 @@ void PRVM_Fields_f (void)
 
        if(Cmd_Argc() != 2)
        {
-               Con_Print("prvm_fields <program name>\n");
+               Con_Printf("prvm_fields <program name>\n");
                return;
        }
 
@@ -1601,7 +1605,7 @@ void PRVM_Globals_f (void)
        }*/
        if(Cmd_Argc () != 2)
        {
-               Con_Print ("prvm_globals <program name>\n");
+               Con_Printf("prvm_globals <program name>\n");
                return;
        }
 
@@ -1650,11 +1654,12 @@ void PRVM_InitProg(int prognr)
 
        prog = &prog_list[prognr];
 
+       if(prog->loaded)
+               PRVM_ResetProg();
+
        memset(prog, 0, sizeof(prvm_prog_t));
 
        prog->time = &prog->_time;
-
-       PRVM_GCALL(init_cmd)();
 }
 
 int PRVM_GetProgNr()