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;
if(Cmd_Argc() != 2)
{
- Con_Print("prvm_edicts <program name>\n");
+ Con_Printf("prvm_edicts <program name>\n");
return;
}
if(Cmd_Argc() != 3)
{
- Con_Print("prvm_edict <program name> <edict number>\n");
+ Con_Printf("prvm_edict <program name> <edict number>\n");
return;
}
if(Cmd_Argc() != 2)
{
- Con_Print("prvm_count <program name>\n");
+ Con_Printf("prvm_count <program name>\n");
return;
}
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->time = &prog->_time;
prog->progs_mempool = t1;
prog->edictstring_mempool = t2;
- prog->edicts_mempool = t3;
+ prog->edicts_mempool = t3;*/
PRVM_GCALL(reset_cmd)();
}
prog->flag |= PRVM_OP_STATE;
PRVM_GCALL(reset_cmd)();
+ PRVM_GCALL(init_cmd)();
// init mempools
PRVM_MEM_Alloc();
if(Cmd_Argc() != 2)
{
- Con_Print("prvm_fields <program name>\n");
+ Con_Printf("prvm_fields <program name>\n");
return;
}
}*/
if(Cmd_Argc () != 2)
{
- Con_Print ("prvm_globals <program name>\n");
+ Con_Printf("prvm_globals <program name>\n");
return;
}
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()