Heretic: Fixing multiplayer issues

Fixed problems with the inventory (more issues remain there). Also fixed ammo amount updates and intermission interaction.
skyjake · May 7, 2011 · 28804c6 · 28804c6
1 parent b5a4f9b
commit 28804c6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/doomsday/engine/portable/src/dd_loop.c b/doomsday/engine/portable/src/dd_loop.c
@@ -364,7 +364,7 @@ void DD_Ticker(timespan_t time)
 
             // Set frametime back by one tick (to stay in the 0..1 range).
             realFrameTimePos -= 1;
-            assert(realFrameTimePos < 1);
+            //assert(realFrameTimePos < 1);
 
             // Camera smoothing: now that the world tic has occurred, the next sharp
             // position can be processed.

diff --git a/doomsday/plugins/common/src/hu_inventory.c b/doomsday/plugins/common/src/hu_inventory.c
@@ -606,7 +606,7 @@ void Hu_InventoryOpen(int player, boolean show)
         return;
 
     plr = &players[player];
-    if(!((plr->plr->flags & DDPF_LOCAL) && plr->plr->inGame))
+    if(!plr->plr->inGame)
         return;
 
     inv = &hudInventories[player];
@@ -688,7 +688,7 @@ boolean Hu_InventoryMove(int player, int dir, boolean canWrap, boolean silent)
         return false;
 
     plr = &players[player];
-    if(!((plr->plr->flags & DDPF_LOCAL) && plr->plr->inGame))
+    if(!plr->plr->inGame)
         return false;
     inv = &hudInventories[player];
 

diff --git a/doomsday/plugins/common/src/p_player.c b/doomsday/plugins/common/src/p_player.c
@@ -341,6 +341,7 @@ void P_ShotAmmo(player_t *player)
         player->ammo[i].owned = MAX_OF(0,
             player->ammo[i].owned - wInfo->mode[fireMode].perShot[i]);
     }
+    player->update |= PSF_AMMO;
 }
 
 /**

diff --git a/doomsday/plugins/common/src/p_user.c b/doomsday/plugins/common/src/p_user.c
@@ -1836,11 +1836,12 @@ void P_PlayerThink(player_t *player, timespan_t ticLength)
     if(!IS_CLIENT) // Locally only.
     {
         P_PlayerThinkSounds(player);
+    }
+
 #if __JHERETIC__ || __JHEXEN__
-        P_PlayerThinkInventory(player);
+    P_PlayerThinkInventory(player);
+    P_PlayerThinkItems(player);
 #endif
-        P_PlayerThinkItems(player);
-    }
 
     P_PlayerThinkUse(player);
     P_PlayerThinkWeapons(player);

diff --git a/doomsday/plugins/jheretic/src/in_lude.c b/doomsday/plugins/jheretic/src/in_lude.c
@@ -405,8 +405,8 @@ void IN_Ticker(void)
             IN_WaitStop();
             return;
         }
-        IN_CheckForSkip();
     }
+    IN_CheckForSkip();
 
     // Counter for general background animation.
     bcnt++;
@@ -489,7 +489,7 @@ void IN_CheckForSkip(void)
 
     for(i = 0, player = players; i < MAXPLAYERS; ++i, player++)
     {
-        if(players->plr->inGame)
+        if(player->plr->inGame)
         {
             if(player->brain.attack)
             {

diff --git a/doomsday/plugins/jhexen/src/in_lude.c b/doomsday/plugins/jhexen/src/in_lude.c
@@ -307,7 +307,7 @@ static void CheckForSkip(void)
 
     for(i = 0, player = players; i < MAXPLAYERS; ++i, player++)
     {
-        if(players[i].plr->inGame)
+        if(player->plr->inGame)
         {
             if(player->brain.attack)
             {