Add IsPlayerInStore()

diasurgical · Sep 20, 2024 · 71a6eaa · 71a6eaa
1 parent 76d43b4
commit 71a6eaa
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/Source/controls/game_controls.cpp b/Source/controls/game_controls.cpp
@@ -171,12 +171,12 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 				return true;
 			}
 			if (VirtualGamepadState.healthButton.isHeld && VirtualGamepadState.healthButton.didStateChange) {
-				if (!QuestLogIsOpen && !SpellbookFlag && Stores.activeStore == TalkID::None)
+				if (!QuestLogIsOpen && !SpellbookFlag && !Stores.IsPlayerInStore())
 					*action = GameAction(GameActionType_USE_HEALTH_POTION);
 				return true;
 			}
 			if (VirtualGamepadState.manaButton.isHeld && VirtualGamepadState.manaButton.didStateChange) {
-				if (!QuestLogIsOpen && !SpellbookFlag && Stores.activeStore == TalkID::None)
+				if (!QuestLogIsOpen && !SpellbookFlag && !Stores.IsPlayerInStore())
 					*action = GameAction(GameActionType_USE_MANA_POTION);
 				return true;
 			}

diff --git a/Source/controls/touch/event_handlers.cpp b/Source/controls/touch/event_handlers.cpp
@@ -63,7 +63,7 @@ bool HandleGameMenuInteraction(const SDL_Event &event)
 
 bool HandleStoreInteraction(const SDL_Event &event)
 {
-	if (Stores.activeStore == TalkID::None)
+	if (!Stores.IsPlayerInStore())
 		return false;
 	if (event.type == SDL_FINGERDOWN)
 		Stores.CheckStoreBtn();

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -1761,7 +1761,7 @@ void InitKeymapActions()
 	    SDLK_F3,
 	    [] { gamemenu_load_game(false); },
 	    nullptr,
-	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && Stores.activeStore == TalkID::None && IsGameRunning(); });
+	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && !Stores.IsPlayerInStore() && IsGameRunning(); });
 #ifndef NOEXIT
 	sgOptions.Keymapper.AddAction(
 	    "QuitGame",
@@ -2328,7 +2328,7 @@ void InitPadmapActions()
 	    ControllerButton_NONE,
 	    [] { gamemenu_load_game(false); },
 	    nullptr,
-	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && Stores.activeStore == TalkID::None && IsGameRunning(); });
+	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && !Stores.IsPlayerInStore() && IsGameRunning(); });
 	sgOptions.Padmapper.AddAction(
 	    "Item Highlighting",
 	    N_("Item highlighting"),

diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp
@@ -613,7 +613,7 @@ void DrawItem(const Surface &out, int8_t itemIndex, Point targetBufferPosition,
 	const Item &item = Items[itemIndex];
 	const ClxSprite sprite = item.AnimInfo.currentSprite();
 	const Point position = targetBufferPosition + item.getRenderingOffset(sprite);
-	if (Stores.activeStore == TalkID::None && (itemIndex == pcursitem || AutoMapShowItems)) {
+	if (!Stores.IsPlayerInStore() && (itemIndex == pcursitem || AutoMapShowItems)) {
 		ClxDrawOutlineSkipColorZero(out, GetOutlineColor(item, false), position, sprite);
 	}
 	ClxDrawLight(out, position, sprite, lightTableIndex);

diff --git a/Source/qol/itemlabels.cpp b/Source/qol/itemlabels.cpp
@@ -98,7 +98,7 @@ void ResetItemlabelHighlighted()
 
 bool IsHighlightingLabelsEnabled()
 {
-	return Stores.activeStore == TalkID::None && highlightKeyPressed != *sgOptions.Gameplay.showItemLabels;
+	return !Stores.IsPlayerInStore() && highlightKeyPressed != *sgOptions.Gameplay.showItemLabels;
 }
 
 void AddItemToLabelQueue(int id, Point position)
@@ -193,15 +193,15 @@ void DrawItemNameLabels(const Surface &out)
 			if (!gmenu_is_active()
 			    && PauseMode == 0
 			    && !MyPlayerIsDead
-			    && Stores.activeStore == TalkID::None
+			    && !Stores.IsPlayerInStore()
 			    && IsMouseOverGameArea()
 			    && LastMouseButtonAction == MouseActionType::None) {
 				isLabelHighlighted = true;
 				cursPosition = item.position;
 				pcursitem = label.id;
 			}
 		}
-		if (pcursitem == label.id && Stores.activeStore == TalkID::None)
+		if (pcursitem == label.id && !Stores.IsPlayerInStore())
 			FillRect(clippedOut, label.pos.x, label.pos.y, label.width, labelHeight, PAL8_BLUE + 6);
 		else
 			DrawHalfTransparentRectTo(clippedOut, label.pos.x, label.pos.y, label.width, labelHeight);

diff --git a/Source/stores.cpp b/Source/stores.cpp
@@ -2547,4 +2547,9 @@ void StoreSession::ReleaseStoreBtn()
 	countdownScrollDown = -1;
 }
 
+bool StoreSession::IsPlayerInStore() const
+{
+	activeStore != TalkID::None;
+}
+
 } // namespace devilution
diff --git a/Source/stores.h b/Source/stores.h
@@ -295,6 +295,7 @@ class StoreSession {
 	void StoreEnter();
 	void CheckStoreBtn();
 	void ReleaseStoreBtn();
+	bool IsPlayerInStore() const;
 
 	// private:
 	TalkID activeStore;                                   // Currently active store