disabled loading of csprogs.dat if developer is less than 100

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 80a270744f0a493419ff256e590082dc82779bfd..152b747fb3b5cf99b6ba58235a06135635e90e35 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -62,6 +62,7 @@ int csqc_fieldoff_scale;
 int csqc_fieldoff_renderflags;
 int csqc_fieldoff_tag_entity;
 int csqc_fieldoff_tag_index;
+int csqc_fieldoff_dphitcontentsmask;
 
 qboolean csqc_loaded = false;
 
@@ -91,7 +92,7 @@ static void CL_VM_FindEdictFieldOffsets (void)
 
        if(CSQC_Parse_Print)
        {
-               csqc_printtextbuf = Mem_Alloc(csqc_mempool, CSQC_PRINTBUFFERLEN);
+               csqc_printtextbuf = (char *)Mem_Alloc(csqc_mempool, CSQC_PRINTBUFFERLEN);
                csqc_printtextbuf[0] = 0;
        }
 }
@@ -171,7 +172,7 @@ static qboolean CSQC_EdictToEntity (prvm_edict_t *ed, entity_t *e)
        int i;
        prvm_eval_t *val;
 
-       i = ed->fields.client->modelindex;
+       i = (int)ed->fields.client->modelindex;
        e->state_current.modelindex = 0;
        if(i >= MAX_MODELS || i <= -MAX_MODELS) //[515]: make work as error ?
        {
@@ -188,7 +189,7 @@ static qboolean CSQC_EdictToEntity (prvm_edict_t *ed, entity_t *e)
        i = 0;
        if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_renderflags)) && val->_float)
        {
-               i = val->_float;
+               i = (int)val->_float;
                if(i & RF_VIEWMODEL)    e->state_current.flags |= RENDER_VIEWMODEL;
                if(i & RF_EXTERNALMODEL)e->state_current.flags |= RENDER_EXTERIORMODEL;
                if(i & RF_DEPTHHACK)    e->state_current.effects |= EF_NODEPTHTEST;
@@ -202,20 +203,20 @@ static qboolean CSQC_EdictToEntity (prvm_edict_t *ed, entity_t *e)
 
        VectorCopy(ed->fields.client->origin, e->persistent.neworigin);
        VectorCopy(ed->fields.client->origin, e->state_current.origin);
-       e->state_current.colormap = ed->fields.client->colormap;
-       e->state_current.effects = ed->fields.client->effects;
-       e->state_current.frame = ed->fields.client->frame;
-       e->state_current.skin = ed->fields.client->skin;
-
-       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_alpha)) && val->_float)             e->state_current.alpha = val->_float*255;
-       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_scale)) && val->_float)             e->state_current.scale = val->_float*16;
-       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_colormod)) && VectorLength2(val->vector))   VectorScale(val->vector, 32, e->state_current.colormod);
-       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_effects)) && val->_float)   e->state_current.effects = val->_float;
+       e->state_current.colormap = (int)ed->fields.client->colormap;
+       e->state_current.effects = (int)ed->fields.client->effects;
+       e->state_current.frame = (int)ed->fields.client->frame;
+       e->state_current.skin = (int)ed->fields.client->skin;
+
+       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_alpha)) && val->_float)             e->state_current.alpha = (int)(val->_float*255);
+       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_scale)) && val->_float)             e->state_current.scale = (int)(val->_float*16);
+       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_colormod)) && VectorLength2(val->vector))   {int j;for (j = 0;j < 3;j++) e->state_current.colormod[j] = (unsigned char)bound(0, val->vector[j] * 32.0f, 255);}
+       if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_effects)) && val->_float)   e->state_current.effects = (int)val->_float;
        if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_entity)) && val->edict)
        {
                e->state_current.tagentity = val->edict;
                if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_index)) && val->_float)
-                       e->state_current.tagindex = val->_float;
+                       e->state_current.tagindex = (int)val->_float;
        }
 
        return true;
@@ -403,6 +404,7 @@ void CSQC_AddPrintText (const char *msg)
                Con_Print(msg);
                return;
        }
+       // FIXME: is this bugged?
        i = strlen(msg)-1;
        if(msg[i] != '\n' && msg[i] != '\r')
        {
@@ -510,11 +512,18 @@ void CL_VM_Init (void)
                return;
        }
        else
+       {
+               if (developer.integer < 100)
+               {
+                       Con_DPrintf("CL_VM_Init: CSQC is broken, and is not being loaded because developer is less than 100.\n");
+                       return;
+               }
                if(!sv.active && !csqc_progcrc.integer) //[515]: because cheaters may use csqc while server didn't allowed it !
                {
                        Con_Printf("CL_VM_Init: server didn't sent CSQC crc, so CSQC is disabled\n");
                        return;
                }
+       }
 
        PRVM_Begin;
        PRVM_InitProg(PRVM_CLIENTPROG);
@@ -574,7 +583,7 @@ void CL_VM_Init (void)
        PRVM_End;
        csqc_loaded = true;
 
-       csqc_sv2csqcents = Mem_Alloc(csqc_mempool, MAX_EDICTS*sizeof(unsigned short));
+       csqc_sv2csqcents = (unsigned short *)Mem_Alloc(csqc_mempool, MAX_EDICTS*sizeof(unsigned short));
        memset(csqc_sv2csqcents, 0, MAX_EDICTS*sizeof(unsigned short));
 
        cl.csqc_vidvars.drawcrosshair = false;