Server: Keep clients' kill, item, and secret counters up to date

Whenever a counter changes, an update is sent to the client.
skyjake · Mar 16, 2013 · 2015678 · 2015678
1 parent 0f92b24
commit 2015678
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 19 deletions.
diff --git a/doomsday/plugins/common/src/d_netcl.c b/doomsday/plugins/common/src/d_netcl.c
@@ -561,9 +561,14 @@ void NetCl_UpdatePlayerState(Reader *msg, int plrNum)
 
     if(flags & PSF_COUNTERS)
     {
-        pl->killCount = Reader_ReadInt16(msg);
-        pl->itemCount = Reader_ReadByte(msg);
+        pl->killCount   = Reader_ReadInt16(msg);
+        pl->itemCount   = Reader_ReadByte(msg);
         pl->secretCount = Reader_ReadByte(msg);
+
+#ifdef _DEBUG
+        Con_Message("NetCl_UpdatePlayerState: kills=%i, items=%i, secrets=%i",
+                    pl->killCount, pl->itemCount, pl->secretCount);
+#endif
     }
 
     if(flags & PSF_PENDING_WEAPON || flags & PSF_READY_WEAPON)

diff --git a/doomsday/plugins/common/src/d_netsv.c b/doomsday/plugins/common/src/d_netsv.c
@@ -190,20 +190,12 @@ void NetSv_Ticker(void)
     {
         player_t* plr = &players[i];
 
-        /*
-        // Don't send on every tic. Also, don't send to all
-        // players at the same time.
-        if(((int) GAMETIC + i) % 10)
-            continue;
-        */
-
         if(!plr->plr->inGame)
             continue;
 
         if(plr->update)
         {
-            // Owned weapons and player state will be sent in a new kind of
-            // packet.
+            // Owned weapons and player state will be sent in the v2 packet.
             if(plr->update & (PSF_OWNED_WEAPONS | PSF_STATE))
             {
                 int flags =
@@ -218,7 +210,6 @@ void NetSv_Ticker(void)
                     continue;
             }
 
-            // The delivery of the state packet will be confirmed.
             NetSv_SendPlayerState(i, i, plr->update, true);
             plr->update = 0;
         }

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -2469,8 +2469,7 @@ void G_DoMapCompleted(void)
             G_PlayerLeaveMap(i); // take away cards and stuff
 
             // Update this client's stats.
-            NetSv_SendPlayerState(i, DDSP_ALL_PLAYERS,
-                                  PSF_FRAGS | PSF_COUNTERS, true);
+            NetSv_SendPlayerState(i, DDSP_ALL_PLAYERS, PSF_FRAGS | PSF_COUNTERS, true);
         }
     }
 

diff --git a/doomsday/plugins/common/src/p_mapsetup.c b/doomsday/plugins/common/src/p_mapsetup.c
@@ -851,6 +851,7 @@ static void P_ResetWorldState(void)
 
         ddplr->mo = NULL;
         plr->killCount = plr->secretCount = plr->itemCount = 0;
+        plr->update |= PSF_COUNTERS;
 
         if(ddplr->inGame && plr->playerState == PST_DEAD)
             plr->playerState = PST_REBORN;

diff --git a/doomsday/plugins/doom/src/p_inter.c b/doomsday/plugins/doom/src/p_inter.c
@@ -861,7 +861,10 @@ void P_TouchSpecialMobj(mobj_t* special, mobj_t* toucher)
     }
 
     if(special->flags & MF_COUNTITEM)
+    {
         player->itemCount++;
+        player->update |= PSF_COUNTERS;
+    }
 
     P_MobjRemove(special, false);
 
@@ -893,7 +896,10 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
     {
         // Count for intermission.
         if(target->flags & MF_COUNTKILL)
+        {
             source->player->killCount++;
+            source->player->update |= PSF_COUNTERS;
+        }
 
         if(target->player)
         {

diff --git a/doomsday/plugins/doom/src/p_spec.c b/doomsday/plugins/doom/src/p_spec.c
@@ -51,7 +51,7 @@
 #include "p_plat.h"
 #include "p_scroll.h"
 #include "p_switch.h"
-#include "d_netsv.h"
+#include "d_net.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -822,6 +822,7 @@ void P_PlayerInSpecialSector(player_t* player)
 
     case 9: ///< SECRET SECTOR
         player->secretCount++;
+        player->update |= PSF_COUNTERS;
         P_ToXSector(sector)->special = 0;
         if(cfg.secretMsg)
         {

diff --git a/doomsday/plugins/doom64/src/p_inter.c b/doomsday/plugins/doom64/src/p_inter.c
@@ -882,7 +882,10 @@ void P_TouchSpecialMobj(mobj_t* special, mobj_t* toucher)
     }
 
     if(special->flags & MF_COUNTITEM)
+    {
         player->itemCount++;
+        player->update |= PSF_COUNTERS;
+    }
 
     P_MobjRemove(special, false);
     player->bonusCount += BONUSADD;
@@ -913,7 +916,10 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
     {
         // Count for intermission.
         if(target->flags & MF_COUNTKILL)
+        {
             source->player->killCount++;
+            source->player->update |= PSF_COUNTERS;
+        }
 
         if(target->player)
         {

diff --git a/doomsday/plugins/doom64/src/p_spec.c b/doomsday/plugins/doom64/src/p_spec.c
@@ -55,7 +55,7 @@
 #include "p_plat.h"
 #include "p_scroll.h"
 #include "p_switch.h"
-#include "d_netsv.h"
+#include "d_net.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -491,6 +491,7 @@ static void P_CrossSpecialLine(LineDef* line, int side, mobj_t* thing)
         /// Also, export this text string to DED.
         P_SetMessage(thing->player, 0, "You've found a secret area!");
         thing->player->secretCount++;
+        thing->player->update |= PSF_COUNTERS;
         xline->special = 0;
         break;
 

diff --git a/doomsday/plugins/heretic/src/in_lude.c b/doomsday/plugins/heretic/src/in_lude.c
@@ -913,7 +913,6 @@ void IN_DrawCoopStats(void)
             DGL_Color4f(defFontRGB[0], defFontRGB[1], defFontRGB[2], 1);
             GL_DrawPatchXY(dpFaceAlive[i], 25, ypos);
 
-
             if(interTime < 40)
             {
                 sounds = 0;

diff --git a/doomsday/plugins/heretic/src/p_inter.c b/doomsday/plugins/heretic/src/p_inter.c
@@ -860,7 +860,10 @@ void P_TouchSpecialMobj(mobj_t* special, mobj_t* toucher)
     }
 
     if(special->flags & MF_COUNTITEM)
+    {
         player->itemCount++;
+        player->update |= PSF_COUNTERS;
+    }
 
     switch(item)
     {
@@ -904,8 +907,10 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
     if(source && source->player)
     {
         if(target->flags & MF_COUNTKILL)
-        {   // Count for intermission.
+        {
+            // Count for intermission.
             source->player->killCount++;
+            source->player->update |= PSF_COUNTERS;
         }
 
         if(target->player)

diff --git a/doomsday/plugins/heretic/src/p_spec.c b/doomsday/plugins/heretic/src/p_spec.c
@@ -54,7 +54,7 @@
 #include "p_user.h"
 #include "p_scroll.h"
 #include "p_switch.h"
-#include "d_netsv.h"
+#include "d_net.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -864,6 +864,7 @@ void P_PlayerInSpecialSector(player_t* player)
         {
             // SECRET SECTOR
             player->secretCount++;
+            player->update |= PSF_COUNTERS;
             P_ToXSector(sector)->special = 0;
             if(cfg.secretMsg)
             {

diff --git a/doomsday/plugins/hexen/src/p_spec.c b/doomsday/plugins/hexen/src/p_spec.c
@@ -676,6 +676,7 @@ void P_PlayerInSpecialSector(player_t* player)
         if(!IS_CLIENT)
         {
             player->secretCount++;
+            player->update |= PSF_COUNTERS;
             xsector->special = 0;
         }
         break;