Added a lot of builtin commands to prvm_cmds.c (mostly from pr_cmds).

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index a55dcffed020db5242864184335c2ca4adc6b701..9ba389a7b9f84d5faed5dfe3e4edc995c48bef68 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -54,7 +54,7 @@ void PRVM_MEM_Alloc()
        prog->max_edicts = min(prog->max_edicts,prog->limit_edicts);
 
        // edictprivate_size has to be min as big prvm_edict_private_t
        prog->max_edicts = min(prog->max_edicts,prog->limit_edicts);
 
        // edictprivate_size has to be min as big prvm_edict_private_t

-       prog->edictprivate_size = max(prog->edictprivate_size,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));
 
        // alloc edicts
        prog->edicts = Mem_Alloc(prog->edicts_mempool,prog->limit_edicts * sizeof(prvm_edict_t));


@@ -215,8 +215,10 @@ prvm_edict_t *PRVM_ED_Alloc (void)
 
        // the client qc dont need maxclients
        // thus it doesnt need to use svs.maxclients
 
        // the client qc dont need maxclients
        // thus it doesnt need to use svs.maxclients

-       // AK: changed i=svs.maxclients+1
-       for (i = 0;i < prog->num_edicts;i++)
+       // AK:  changed i=svs.maxclients+1
+       // AK:  changed so the edict 0 wont spawned -> 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
        {
                e = PRVM_EDICT_NUM(i);
                // the first couple seconds of server time can involve a lot of


@@ -1443,10 +1445,13 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
        if(PRVM_ED_FindGlobal("time"))
                prog->flag |= PRVM_GE_TIME;
 
        if(PRVM_ED_FindGlobal("time"))
                prog->flag |= PRVM_GE_TIME;
 

-       if(PRVM_ED_FindFieldOffset ("classname"))
+       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_FindFieldOffset ("nextthink") && PRVM_ED_FindFieldOffset("frame") && PRVM_ED_FindFieldOffset("think") 
+       if(PRVM_ED_FindField ("nextthink") && PRVM_ED_FindField ("frame") && PRVM_ED_FindField ("think") 

                && prog->flag &  PRVM_GE_TIME && prog->self) 
                prog->flag |= PRVM_OP_STATE;
        
                && prog->flag &  PRVM_GE_TIME && prog->self) 
                prog->flag |= PRVM_OP_STATE;