Fixed Heretic/Hexen: Ensure the inventory widget is closed upon enter…

…ing a new map or on player death if open.

Fixed Heretic/Hexen: Horizontal placement of the fullscreen inventory widget sub-elements calculated incorrectly.

doomsday/plugins/common/src/d_netcl.c

@@ -50,6 +50,7 @@
 #include "g_common.h"
 #include "p_actor.h"
 #include "p_inventory.h"
+#include "hu_inventory.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -605,9 +606,14 @@ void NetCl_Intermission(byte* data)
     {
         uint i;
 
-        // Close any automaps left open at the end of the previous map.
+        // Close any HUDs left open at the end of the previous map.
         for(i = 0; i < MAXPLAYERS; ++i)
+        {
             AM_Open(AM_MapForPlayer(i), false, true);
+#if __JHERETIC__ || __JHEXEN__
+            Hu_InventoryOpen(i, false);
+#endif
+        }
 
         GL_SetFilter(false);
 

doomsday/plugins/common/src/g_game.c

@@ -1447,6 +1447,10 @@ boolean G_StartFinale(const char* script, int flags, finale_mode_t mode)
 
         // Close the automap for all local players.
         AM_Open(AM_MapForPlayer(i), false, true);
+
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(i, false);
+#endif
     }}
     FI_StackExecute(script, flags, mode);
     return true;
@@ -2437,6 +2441,10 @@ void G_DoMapCompleted(void)
         {
             AM_Open(AM_MapForPlayer(i), false, true);
 
+#if __JHERETIC__ || __JHEXEN__
+            Hu_InventoryOpen(i, false);
+#endif
+
             G_PlayerLeaveMap(i); // take away cards and stuff
 
             // Update this client's stats.
@@ -2738,8 +2746,14 @@ void G_InitNew(skillmode_t skill, uint episode, uint map)
 
     // Close any open automaps.
     for(i = 0; i < MAXPLAYERS; ++i)
-        if(players[i].plr->inGame)
-            AM_Open(AM_MapForPlayer(i), false, true);
+    {
+        if(!players[i].plr->inGame)
+            continue;
+        AM_Open(AM_MapForPlayer(i), false, true);
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(i, false);
+#endif
+    }
 
     // If there are any InFine scripts running, they must be stopped.
     FI_StackClear();
@@ -3362,8 +3376,12 @@ int Hook_DemoStop(int hookType, int val, void* paramaters)
 
     {int i;
     for(i = 0; i < MAXPLAYERS; ++i)
+    {
         AM_Open(AM_MapForPlayer(i), false, true);
-    }
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(i, false);
+#endif
+    }}
     return true;
 }
 

doomsday/plugins/common/src/hu_inventory.c

@@ -278,6 +278,9 @@ static void inventoryIndexes(const player_t* plr, const hud_inventory_t* inv,
             first = 0;
     }
 
+    if(from < 0)
+        from = 0;
+
     if(firstVisible)
         *firstVisible = (unsigned) first;
     if(cursorPos)
@@ -365,7 +368,7 @@ Draw_BeginZoom(invScale, x, y + ST_INVENTORYHEIGHT);
         a = i == selected? .5f : light / 2;
 
         DGL_Color4f(light, light, light, a * iconAlpha);
-        GL_DrawPatch(dpInvItemBox, x + slot * ST_INVSLOTWIDTH + ST_INVSLOTOFFX, y);
+        GL_DrawPatch(dpInvItemBox, x + slot * ST_INVSLOTWIDTH + (slot > 1? (slot-1) * ST_INVSLOTOFFX : 0), y);
 
         if(i >= startSlot && i < endSlot)
         {
@@ -375,9 +378,9 @@ Draw_BeginZoom(invScale, x, y + ST_INVENTORYHEIGHT);
             if((count = P_InventoryCount(player, item->type)))
             {
 #if __JHEXEN__
-                int posX = x + slot * ST_INVSLOTWIDTH - 1;
+                int posX = x + slot * ST_INVSLOTWIDTH + (slot > 1? (slot-1) * ST_INVSLOTOFFX : 0) - 1;
 #else
-                int posX = x + slot * ST_INVSLOTWIDTH;
+                int posX = x + slot * ST_INVSLOTWIDTH + (slot > 1? (slot-1) * ST_INVSLOTOFFX : 0);
 #endif
                 DGL_Color4f(1, 1, 1, slot == selected? iconAlpha : iconAlpha / 2);
                 GL_DrawPatch(item->patchId, posX, y + ST_INVICONOFFY);
@@ -387,7 +390,7 @@ Draw_BeginZoom(invScale, x, y + ST_INVENTORYHEIGHT);
                     char buf[20];
                     DGL_Color4f(defFontRGB3[CR], defFontRGB3[CG], defFontRGB3[CB], slot == selected? textAlpha : textAlpha / 2);
                     dd_snprintf(buf, 20, "%i", count);
-                    GL_DrawTextFragment4(buf, x + slot * ST_INVSLOTWIDTH + ST_INVCOUNTOFFX, y + ST_INVCOUNTOFFY, GF_SMALLIN, DTF_ALIGN_TOPRIGHT|DTF_NO_EFFECTS, TRACKING);
+                    GL_DrawTextFragment4(buf, posX + ST_INVCOUNTOFFX, y + ST_INVCOUNTOFFY, GF_SMALLIN, DTF_ALIGN_TOPRIGHT|DTF_NO_EFFECTS, TRACKING);
                 }
             }
 
@@ -398,7 +401,7 @@ Draw_BeginZoom(invScale, x, y + ST_INVENTORYHEIGHT);
     }
 
     DGL_Color4f(1, 1, 1, iconAlpha);
-    GL_DrawPatch(dpInvSelectBox, x + selected * ST_INVSLOTWIDTH, y + ST_INVSELECTOFFY - BORDER);
+    GL_DrawPatch(dpInvSelectBox, x + selected * ST_INVSLOTWIDTH + (selected > 1? (selected-1) * ST_INVSLOTOFFX : 0), y + ST_INVSELECTOFFY - BORDER);
 
     if(inv->numUsedSlots > maxVisSlots)
     {
@@ -414,7 +417,7 @@ Draw_BeginZoom(invScale, x, y + ST_INVENTORYHEIGHT);
         if(cfg.inventoryWrap || inv->numUsedSlots - first > numVisSlots)
         {
             DGL_Color4f(1, 1, 1, iconAlpha);
-            GL_DrawPatch(dpInvPageRight[!(mapTime & 4)? 1 : 0], x + numVisSlots * ST_INVSLOTWIDTH + ARROW_RELXOFF + 1, y + ARROW_YOFFSET);
+            GL_DrawPatch(dpInvPageRight[!(mapTime & 4)? 1 : 0], x + numVisSlots * ST_INVSLOTWIDTH + (numVisSlots > 1? (numVisSlots-1) * ST_INVSLOTOFFX : 0) + ARROW_RELXOFF - 2, y + ARROW_YOFFSET);
         }
 
 #undef ARROW_XOFFSET
@@ -497,26 +500,14 @@ void Hu_InventoryDraw2(int player, int x, int y, float alpha)
         if(cfg.inventoryWrap || first != 0)
         {
             DGL_Color4f(1, 1, 1, alpha);
-            GL_DrawPatch(dpInvPageLeft[!(mapTime & 4)? 1 : 0],
-#if __JHEXEN__
-                                 42, 163
-#else
-                                 x - 12, y - 1
-#endif
-                                 );
+            GL_DrawPatch(dpInvPageLeft[!(mapTime & 4)? 1 : 0], x - 12, y - 1);
         }
 
         // Draw more right indicator.
         if(cfg.inventoryWrap || inv->numUsedSlots - first > NUMVISINVSLOTS)
         {
             DGL_Color4f(1, 1, 1, alpha);
-            GL_DrawPatch(dpInvPageRight[!(mapTime & 4)? 1 : 0], 269,
-#if __JHEXEN__
-                                 163
-#else
-                                 y - 1
-#endif
-                                 );
+            GL_DrawPatch(dpInvPageRight[!(mapTime & 4)? 1 : 0], x + NUMVISINVSLOTS * ST_INVSLOTWIDTH + (NUMVISINVSLOTS-1) * ST_INVSLOTOFFX - 2, y - 1);
         }
     }
 

doomsday/plugins/jdoom/src/p_inter.c

@@ -938,6 +938,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
 
         // Don't die with the automap open.
         AM_Open(AM_MapForPlayer(target->player - players), false, false);
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(target->player - players, false);
+#endif
     }
 
     if(target->health < -target->info->spawnHealth &&

doomsday/plugins/jdoom64/src/p_inter.c

@@ -950,6 +950,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
 
         // Don't die with the automap open.
         AM_Open(AM_MapForPlayer(target->player - players), false, false);
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(target->player - players, false);
+#endif
     }
 
     if((state = P_GetState(target->type, SN_XDEATH)) != S_NULL &&

doomsday/plugins/jheretic/src/p_inter.c

@@ -36,6 +36,7 @@
 #include "dmu_lib.h"
 #include "p_player.h"
 #include "p_inventory.h"
+#include "hu_inventory.h"
 #include "p_tick.h"
 #include "p_user.h"
 #include "p_mapsetup.h"
@@ -968,6 +969,9 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
 
         // Don't die with the automap open.
         AM_Open(AM_MapForPlayer(target->player - players), false, false);
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(target->player - players, false);
+#endif
     }
 
     if((state = P_GetState(target->type, SN_XDEATH)) != S_NULL &&

doomsday/plugins/jhexen/src/m_cheat.c

@@ -44,6 +44,7 @@
 #include "p_user.h"
 #include "p_start.h"
 #include "p_inventory.h"
+#include "hu_inventory.h"
 #include "g_eventsequence.h"
 
 // MACROS ------------------------------------------------------------------
@@ -390,8 +391,12 @@ int Cht_WarpFunc(const int* args, int player)
 
     // Close any open automaps.
     for(i = 0; i < MAXPLAYERS; ++i)
-        if(players[i].plr->inGame)
-            AM_Open(AM_MapForPlayer(i), false, true);
+    {
+        if(!players[i].plr->inGame)
+            continue;
+        AM_Open(AM_MapForPlayer(i), false, true);
+        Hu_InventoryOpen(i, false);
+    }
 
     // So be it.
     if(userGame)

doomsday/plugins/jhexen/src/p_inter.c

@@ -1463,6 +1463,9 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
 
         // Don't die with the automap open.
         AM_Open(AM_MapForPlayer(target->player - players), false, false);
+#if __JHERETIC__ || __JHEXEN__
+        Hu_InventoryOpen(target->player - players, false);
+#endif
     }
     else
     {   // Target is some monster or an object.