fix CSQC being unable to use the "effects" field as its fieldoffset never got initialized

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10446 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e46b145fb645c005413c7f34360d1d02498f8898

diff --git a/csprogs.c b/csprogs.c
index 3e82840f0ca68fea5388c4bb632dee5079fd3faa..1ebf6738a3e3be6154f2d3e311fecb85c95cc8e0 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -205,7 +205,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
        if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float)           entrender->scale = scale = val->_float;
        if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->colormod);
        if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.glowmod)) && VectorLength2(val->vector))  VectorCopy(val->vector, entrender->glowmod);
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) entrender->effects |= (int)val->_float;
+       if(ed->fields.client->effects)  entrender->effects |= (int)ed->fields.client->effects;
        if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
        {
                int tagentity;

diff --git a/progsvm.h b/progsvm.h
index 6c048ba4af03f4f554b1fede58831a45b385cd02..087972ed3b204ef0b31afcf6151bfb15b3e72e02 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -191,7 +191,6 @@ typedef struct prvm_prog_fieldoffsets_s
        int discardabledemo; // ssqc
        int dphitcontentsmask; // ssqc / csqc
        int drawonlytoclient; // ssqc
-       int effects; // ssqc / csqc
        int exteriormodeltoclient; // ssqc
        int fatness; // ssqc / csqc
        int forceshader; // csqc