Client: Fixed status bar (was not being drawn)

skyjake · Mar 22, 2011 · d945bf9 · d945bf9
1 parent b4e9656
commit d945bf9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/doomsday/plugins/common/src/p_player.c b/doomsday/plugins/common/src/p_player.c
@@ -321,6 +321,8 @@ void P_ShotAmmo(player_t *player)
     weaponinfo_t*       wInfo =
         &weaponInfo[player->readyWeapon][player->class_];
 
+    if(IS_CLIENT) return; // Server keeps track of this.
+
 #if __JHERETIC__
     if(deathmatch)
         fireMode = 0; // In deathmatch always use mode zero.

diff --git a/doomsday/plugins/jdoom/src/d_refresh.c b/doomsday/plugins/jdoom/src/d_refresh.c
@@ -297,8 +297,7 @@ static void rendHUD(int player)
         if(!(AM_IsActive(map) && cfg.automapHudDisplay == 0) &&
            !(P_MobjIsCamera(plr->plr->mo) && Get(DD_PLAYBACK)))
         {
-            int                 viewmode =
-                ((WINDOWHEIGHT == 200)? cfg.setBlocks - 10 : 0);
+            int viewmode = ((WINDOWHEIGHT == 200)? cfg.setBlocks - 10 : 0);
 
             ST_Drawer(player, viewmode, redrawsbar);
         }

diff --git a/doomsday/plugins/jdoom/src/st_stuff.c b/doomsday/plugins/jdoom/src/st_stuff.c
@@ -1249,7 +1249,7 @@ void ST_Drawer(int player, int fullscreenMode, boolean refresh)
         return;
 
     plr = &players[player];
-    if(!((plr->plr->flags & DDPF_LOCAL) && plr->plr->inGame))
+    if(/*!((plr->plr->flags & DDPF_LOCAL) &&*/ !plr->plr->inGame)
         return;
 
     hud = &hudStates[player];