Fixed Locker access from the outpost locker rooms and a small code tw…

…eak to get rid of a holdover from about 2 years ago
Kyle873 · Nov 28, 2014 · 9a1c4eb · 9a1c4eb
1 parent cb2ed08
commit 9a1c4eb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/DoomRPG/acs/RPG.lib b/DoomRPG/acs/RPG.lib
diff --git a/DoomRPG/maps/Outpost.wad b/DoomRPG/maps/Outpost.wad
diff --git a/DoomRPG/scripts/Menu.ds b/DoomRPG/scripts/Menu.ds
@@ -1157,7 +1157,7 @@ function void MenuInput()
             Player.MenuBlock = true;
 
             if (Player.MenuIndex == 5)
-                OpenShop(true)
+                OpenShop(false)
             else
             {
                 ActivatorSound("menu/move", 127);

diff --git a/DoomRPG/scripts/Shop.ds b/DoomRPG/scripts/Shop.ds
@@ -13,7 +13,7 @@ static int GlobalShopCard;
 int ShopSpotID = 1000;
 
 // Open the Shop
-acscript void OpenShop(bool FromBase) net
+acscript void OpenShop(bool OpenLocker) net
 {
     // If you're dead, return
     if (GetActorProperty(0, APROP_Health) <= 0) return;
@@ -27,11 +27,11 @@ acscript void OpenShop(bool FromBase) net
     // Close the main menu if it's open
     Player.InMenu = false;
 
+    // Sanity check for pressing use while the shop is open in front of the counter in the Outpost
+    if (Player.InShop && GetPlayerInput(PlayerNumber(), INPUT_BUTTONS) & BT_USE) return;
+
     if (Player.InShop)
     {
-        // Sanity Check to prevent the shop closing itself after buying an item in the Outpost Shop
-        if (!FromBase) return;
-
         ActivatorSound("menu/leave", 127);
         SetPlayerProperty(0, 0, PROP_TOTALLYFROZEN);
         Player.InShop = false;
@@ -40,6 +40,8 @@ acscript void OpenShop(bool FromBase) net
     {
         ActivatorSound("menu/shop", 127);
         Player.InShop = true;
+        if (OpenLocker)
+            Player.LockerMode = true;
     };
 };