Cleanup

Removed old DDPF_FILTER flag.

doomsday/engine/api/dd_share.h

@@ -1280,7 +1280,7 @@ typedef struct ticcmd_s {
 
     // Player flags.
 #define DDPF_FIXANGLES          0x0001 // Server: send angle/pitch to client.
-#define DDPF_FILTER             0x0002 // Server: send filter to client.
+//#define DDPF_FILTER             0x0002 // Server: send filter to client.
 #define DDPF_FIXPOS             0x0004 // Server: send coords to client.
 #define DDPF_DEAD               0x0008 // Cl & Sv: player is dead.
 #define DDPF_CAMERA             0x0010 // Player is a cameraman.

doomsday/engine/portable/src/sv_pool.c

@@ -670,46 +670,15 @@ boolean Sv_RegisterComparePlayer(cregister_t* reg, uint number,
         df |= PDF_FORWARDMOVE;
     if(r->sideMove != s->sideMove)
         df |= PDF_SIDEMOVE;
-    /*if(r->angle != s->angle)
-        df |= PDF_ANGLE;*/
     if(r->turnDelta != s->turnDelta)
         df |= PDF_TURNDELTA;
     if(r->friction != s->friction)
         df |= PDF_FRICTION;
     if(r->extraLight != s->extraLight || r->fixedColorMap != s->fixedColorMap)
-    {
         df |= PDF_EXTRALIGHT;
-    }
     if(r->filter != s->filter)
         df |= PDF_FILTER;
 
-    /*
-    // The player sprites are a bit more complicated to check.
-    for(i = 0; i < 2; ++i)
-    {
-        int     off = 16 + i * 8;
-        const ddpsprite_t *rps = r->psp + i;
-        const ddpsprite_t *sps = s->psp + i;
-
-        if(rps->statePtr != sps->statePtr)
-            df |= PSDF_STATEPTR << off;
-
-        if(rps->light != sps->light)
-            df |= PSDF_LIGHT << off;
-        if(rps->alpha != sps->alpha)
-            df |= PSDF_ALPHA << off;
-        if(rps->state != sps->state)
-            df |= PSDF_STATE << off;
-        if((rps->offX != sps->offX || rps->offY != sps->offY) && !i)
-        {
-            df |= PSDF_OFFSET << off;
-        }
-    }
-    // Check for any psprite flags.
-    if(df & 0xffff0000)
-        df |= PDF_PSPRITES;
-    */
-
     d->delta.flags = df;
     return !Sv_IsVoidDelta(d);
 }
@@ -752,27 +721,6 @@ boolean Sv_RegisterCompareSector(cregister_t* reg, uint number,
     if(r->planes[PLN_CEILING].surface.rgba[2] != s->SP_ceilrgb[2])
         df |= SDF_CEIL_COLOR_BLUE;
 
-    /*
-    if(r->planes[PLN_FLOOR].glowRGB[0] != s->SP_floorglowrgb[0])
-        df |= SDF_FLOOR_GLOW_RED;
-    if(r->planes[PLN_FLOOR].glowRGB[1] != s->SP_floorglowrgb[1])
-        df |= SDF_FLOOR_GLOW_GREEN;
-    if(r->planes[PLN_FLOOR].glowRGB[2] != s->SP_floorglowrgb[2])
-        df |= SDF_FLOOR_GLOW_BLUE;
-
-    if(r->planes[PLN_CEILING].glowRGB[0] != s->SP_ceilglowrgb[0])
-        df |= SDF_CEIL_GLOW_RED;
-    if(r->planes[PLN_CEILING].glowRGB[1] != s->SP_ceilglowrgb[1])
-        df |= SDF_CEIL_GLOW_GREEN;
-    if(r->planes[PLN_CEILING].glowRGB[2] != s->SP_ceilglowrgb[2])
-        df |= SDF_CEIL_GLOW_BLUE;
-
-    if(r->planes[PLN_FLOOR].glow != s->planes[PLN_FLOOR]->glow)
-        df |= SDF_FLOOR_GLOW;
-    if(r->planes[PLN_CEILING].glow != s->planes[PLN_CEILING]->glow)
-        df |= SDF_CEIL_GLOW;
-        */
-
     // The cases where an immediate change to a plane's height is needed:
     // 1) Plane is not moving, but the heights are different. This means
     //    the plane's height was changed unpredictably.

doomsday/plugins/common/src/d_netsv.c

@@ -239,7 +239,7 @@ void NetSv_Ticker(void)
         {   // The filter changes.
             R_GetFilterColor(plr->plr->filterColor, palette);
             // If we are the server, we'll need inform the client.
-            plr->plr->flags |= DDPF_FILTER;
+            //plr->plr->flags |= DDPF_FILTER;
             oldPals[i] = palette;
         }
     }

doomsday/plugins/common/src/g_game.c

@@ -31,6 +31,7 @@
 // HEADER FILES ------------------------------------------------------------
 
 #include <ctype.h>
+#include <assert.h>
 #include <string.h>
 #include <math.h>
 
@@ -1448,7 +1449,7 @@ void G_PlayerLeaveMap(int player)
 
     // Clear filter.
     p->plr->flags &= ~DDPF_VIEW_FILTER;
-    p->plr->flags |= DDPF_FILTER; // Server: Send the change to the client.
+    //p->plr->flags |= DDPF_FILTER; // Server: Send the change to the client.
     p->damageCount = 0; // No palette changes.
     p->bonusCount = 0;
 
@@ -1497,16 +1498,6 @@ void ClearPlayer(player_t *p)
     ddplayer->fixCounter.angles++;
     ddplayer->fixCounter.pos++;
     ddplayer->fixCounter.mom++;
-
-/*    ddplayer->fixAcked.angles =
-        ddplayer->fixAcked.pos =
-        ddplayer->fixAcked.mom = -1;
-#ifdef _DEBUG
-    Con_Message("ClearPlayer: fixacked set to -1 (counts:%i, %i, %i)\n",
-                ddplayer->fixCounter.angles,
-                ddplayer->fixCounter.pos,
-                ddplayer->fixCounter.mom);
-#endif*/
 }
 
 /**