Client: Fixed HUD info updates

Keycards, ammo, etc. were not updated in the client's status bar.
skyjake · Apr 19, 2011 · 27484a2 · 27484a2
1 parent cf2e72e
commit 27484a2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/doomsday/plugins/jdoom/src/st_stuff.c b/doomsday/plugins/jdoom/src/st_stuff.c
@@ -806,31 +806,30 @@ void ST_Ticker(void)
 {
     int                 i;
 
+    if(P_IsPaused()) return;
+
     for(i = 0; i < MAXPLAYERS; ++i)
     {
         player_t*           plr = &players[i];
         hudstate_t*         hud = &hudStates[i];
 
-        if(!(plr->plr->inGame && (plr->plr->flags & DDPF_LOCAL)))
+        if(!plr->plr->inGame) // && (plr->plr->flags & DDPF_LOCAL)))
             continue;
 
-        if(!P_IsPaused())
+        if(cfg.hudTimer == 0)
         {
-            if(cfg.hudTimer == 0)
-            {
-                hud->hideTics = hud->hideAmount = 0;
-            }
-            else
-            {
-                if(hud->hideTics > 0)
-                    hud->hideTics--;
-                if(hud->hideTics == 0 && cfg.hudTimer > 0 && hud->hideAmount < 1)
-                    hud->hideAmount += 0.1f;
-            }
-
-            ST_updateWidgets(i);
-            hud->oldHealth = plr->health;
+            hud->hideTics = hud->hideAmount = 0;
         }
+        else
+        {
+            if(hud->hideTics > 0)
+                hud->hideTics--;
+            if(hud->hideTics == 0 && cfg.hudTimer > 0 && hud->hideAmount < 1)
+                hud->hideAmount += 0.1f;
+        }
+
+        ST_updateWidgets(i);
+        hud->oldHealth = plr->health;
     }
 }
 

diff --git a/doomsday/plugins/jdoom64/src/st_stuff.c b/doomsday/plugins/jdoom64/src/st_stuff.c
@@ -187,7 +187,7 @@ void ST_Ticker(void)
         player_t*           plr = &players[i];
         hudstate_t*         hud = &hudStates[i];
 
-        if(!(plr->plr->inGame && (plr->plr->flags & DDPF_LOCAL)))
+        if(!plr->plr->inGame) // && (plr->plr->flags & DDPF_LOCAL)))
             continue;
 
         if(!P_IsPaused())

diff --git a/doomsday/plugins/jheretic/src/st_stuff.c b/doomsday/plugins/jheretic/src/st_stuff.c
@@ -519,7 +519,7 @@ void ST_Ticker(void)
         player_t*           plr = &players[i];
         hudstate_t*         hud = &hudStates[i];
 
-        if(!(plr->plr->inGame && (plr->plr->flags & DDPF_LOCAL)))
+        if(!plr->plr->inGame) // && (plr->plr->flags & DDPF_LOCAL)))
             continue;
 
         ST_updateWidgets(i);

diff --git a/doomsday/plugins/jhexen/src/st_stuff.c b/doomsday/plugins/jhexen/src/st_stuff.c
@@ -1141,7 +1141,7 @@ void ST_Ticker(void)
         player_t*           plr = &players[i];
         hudstate_t*         hud = &hudStates[i];
 
-        if(!(plr->plr->inGame && (plr->plr->flags & DDPF_LOCAL)))
+        if(!plr->plr->inGame) //&& (plr->plr->flags & DDPF_LOCAL)))
             continue;
 
         ST_updateWidgets(i);