fix for glowing invisible models showing up (artifact items staying visible after...

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 1dc26376f23bce324ecb5361977d4af9982cb962..17f5f5007bb78b5b9c78f41c8d4dd474ea191485 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -489,7 +489,7 @@ loc0:
        }
 
        // node - recurse down the BSP tree
-       switch (BOX_ON_PLANE_SIDE(mins, maxs, node->plane))
+       switch (BoxOnPlaneSide(mins, maxs, node->plane))
        {
        case 1: // front
                node = node->children[0];
@@ -518,7 +518,7 @@ SV_WriteEntitiesToClient
 #ifdef QUAKEENTITIES
 void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 {
-       int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects;
+       int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
        int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
        qbyte *pvs;
        vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
@@ -863,9 +863,9 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 #else
 void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 {
-       int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects;
+       int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex;
        int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
-       float alphaf;
+       float alphaf, lightsize;
        qbyte *pvs;
        vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
        edict_t *ent;
@@ -881,9 +881,19 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
        Mod_CheckLoaded(sv.worldmodel);
 
 // find the client's PVS
+       // the real place being tested from
        VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
        pvs = SV_FatPVS (testeye);
-       EntityFrame_Clear(&entityframe, testeye);
+
+       // the place being reported (to consider the fact the client still
+       // applies the view_ofs[2], so we have to only send the fractional part
+       // of view_ofs[2], undoing what the client will redo)
+       VectorCopy (testeye, testorigin);
+       e = (int) clent->v.view_ofs[2] & 255;
+       if (e >= 128)
+               e -= 256;
+       testorigin[2] -= (float) e;
+       EntityFrame_Clear(&entityframe, testorigin);
 
        culled_pvs = 0;
        culled_portal = 0;
@@ -921,17 +931,45 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                }
 
                glowsize = 0;
-
+               effects = ent->v.effects;
                if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
                        glowsize = (int) val->_float >> 2;
                glowsize = bound(0, glowsize, 255);
 
+               lightsize = 0;
+               if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+               {
+                       if (effects & EF_BRIGHTFIELD)
+                               lightsize = max(lightsize, 80);
+                       if (effects & EF_MUZZLEFLASH)
+                               lightsize = max(lightsize, 100);
+                       if (effects & EF_BRIGHTLIGHT)
+                               lightsize = max(lightsize, 400);
+                       if (effects & EF_DIMLIGHT)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_RED)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_BLUE)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_FLAME)
+                               lightsize = max(lightsize, 250);
+                       if (effects & EF_STARDUST)
+                               lightsize = max(lightsize, 100);
+               }
+               if (glowsize)
+                       lightsize = max(lightsize, glowsize << 2);
+
                if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
                if (val->_float != 0)
+               {
                        flags |= RENDER_GLOWTRAIL;
+                       lightsize = max(lightsize, 100);
+               }
 
+               modelindex = 0;
                if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
                {
+                       modelindex = ent->v.modelindex;
                        model = sv.models[(int)ent->v.modelindex];
                        Mod_CheckLoaded(model);
                }
@@ -939,7 +977,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                {
                        model = NULL;
                        if (ent != clent) // LordHavoc: always send player
-                               if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+                               if (lightsize == 0) // no effects
                                        continue;
                }
 
@@ -986,6 +1024,15 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                                        VectorAdd(entmaxs, model->normalmaxs, entmaxs);
                                }
                        }
+                       if (lightsize)
+                       {
+                               entmins[0] = min(entmins[0], origin[0] - lightsize);
+                               entmins[1] = min(entmins[1], origin[1] - lightsize);
+                               entmins[2] = min(entmins[2], origin[2] - lightsize);
+                               entmaxs[0] = min(entmaxs[0], origin[0] + lightsize);
+                               entmaxs[1] = min(entmaxs[1], origin[1] + lightsize);
+                               entmaxs[2] = min(entmaxs[2], origin[2] + lightsize);
+                       }
 
                        totalentities++;
 
@@ -1059,7 +1106,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 
                if (ent != clent)
                {
-                       if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+                       if (lightsize == 0) // no effects
                        {
                                if (model) // model
                                {
@@ -1087,10 +1134,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                        break;
                VectorCopy(origin, s->origin);
                VectorCopy(angles, s->angles);
+               if (ent->v.colormap >= 1024)
+                       flags |= RENDER_COLORMAPPED;
                s->colormap = ent->v.colormap;
                s->skin = ent->v.skin;
                s->frame = ent->v.frame;
-               s->modelindex = ent->v.modelindex;
+               s->modelindex = modelindex;
                s->effects = effects;
                s->alpha = alpha;
                s->scale = scale;
@@ -1170,7 +1219,8 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 
        bits = 0;
 
-       bits |= SU_VIEWHEIGHT;
+       if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT)
+               bits |= SU_VIEWHEIGHT;
 
        if (ent->v.idealpitch)
                bits |= SU_IDEALPITCH;
@@ -1244,8 +1294,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
                MSG_WriteByte(msg, bits >> 24);
 
        if (bits & SU_VIEWHEIGHT)
-               //MSG_WriteChar (msg, ent->v.view_ofs[2]);
-               MSG_WriteChar (msg, 0);
+               MSG_WriteChar (msg, ent->v.view_ofs[2]);
 
        if (bits & SU_IDEALPITCH)
                MSG_WriteChar (msg, ent->v.idealpitch);
@@ -1493,9 +1542,9 @@ SV_ModelIndex
 
 ================
 */
-int SV_ModelIndex (char *name)
+int SV_ModelIndex (const char *name)
 {
-       int             i;
+       int i;
 
        if (!name || !name[0])
                return 0;
@@ -1644,7 +1693,7 @@ This is called at the start of each level
 */
 extern float           scr_centertime_off;
 
-void SV_SpawnServer (char *server)
+void SV_SpawnServer (const char *server)
 {
        edict_t         *ent;
        int                     i;