`enum talk_id` -> `enum class TalkID`

Source/control.cpp

@@ -491,7 +491,7 @@ bool IsLevelUpButtonVisible()
 	if (ControlMode == ControlTypes::VirtualGamepad) {
 		return false;
 	}
-	if (stextflag != STORE_NONE || IsStashOpen) {
+	if (stextflag != TalkID::None || IsStashOpen) {
 		return false;
 	}
 	if (QuestLogIsOpen && GetLeftPanel().contains(GetMainPanel().position + Displacement { 0, -74 })) {

Source/controls/game_controls.cpp

@@ -133,7 +133,7 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 					if (ControllerActionHeld == GameActionType_NONE) {
 						ControllerActionHeld = GameActionType_PRIMARY_ACTION;
 					}
-				} else if (sgpCurrentMenu != nullptr || stextflag != STORE_NONE || QuestLogIsOpen) {
+				} else if (sgpCurrentMenu != nullptr || stextflag != TalkID::None || QuestLogIsOpen) {
 					*action = GameActionSendKey { SDLK_RETURN, false };
 				} else {
 					*action = GameActionSendKey { SDLK_SPACE, false };
@@ -170,12 +170,12 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 				return true;
 			}
 			if (VirtualGamepadState.healthButton.isHeld && VirtualGamepadState.healthButton.didStateChange) {
-				if (!QuestLogIsOpen && !sbookflag && stextflag == STORE_NONE)
+				if (!QuestLogIsOpen && !sbookflag && stextflag == TalkID::None)
 					*action = GameAction(GameActionType_USE_HEALTH_POTION);
 				return true;
 			}
 			if (VirtualGamepadState.manaButton.isHeld && VirtualGamepadState.manaButton.didStateChange) {
-				if (!QuestLogIsOpen && !sbookflag && stextflag == STORE_NONE)
+				if (!QuestLogIsOpen && !sbookflag && stextflag == TalkID::None)
 					*action = GameAction(GameActionType_USE_MANA_POTION);
 				return true;
 			}
@@ -195,7 +195,7 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 
 	SDL_Keycode translation = SDLK_UNKNOWN;
 
-	if (gmenu_is_active() || stextflag != STORE_NONE)
+	if (gmenu_is_active() || stextflag != TalkID::None)
 		translation = TranslateControllerButtonToGameMenuKey(ctrlEvent.button);
 	else if (inGameMenu)
 		translation = TranslateControllerButtonToMenuKey(ctrlEvent.button);

Source/controls/plrctrls.cpp

@@ -64,7 +64,7 @@ quest_id pcursquest = Q_INVALID;
  */
 bool InGameMenu()
 {
-	return stextflag != STORE_NONE
+	return stextflag != TalkID::None
 	    || HelpFlag
 	    || ChatLogFlag
 	    || talkflag
@@ -1377,7 +1377,7 @@ HandleLeftStickOrDPadFn GetLeftStickOrDPadGameUIHandler()
 	if (QuestLogIsOpen) {
 		return &QuestLogMove;
 	}
-	if (stextflag != STORE_NONE) {
+	if (stextflag != TalkID::None) {
 		return &StoreMove;
 	}
 	return nullptr;

Source/controls/touch/event_handlers.cpp

@@ -62,7 +62,7 @@ bool HandleGameMenuInteraction(const SDL_Event &event)
 
 bool HandleStoreInteraction(const SDL_Event &event)
 {
-	if (stextflag == STORE_NONE)
+	if (stextflag == TalkID::None)
 		return false;
 	if (event.type == SDL_FINGERDOWN)
 		CheckStoreBtn();

Source/controls/touch/renderers.cpp

@@ -426,7 +426,7 @@ VirtualGamepadButtonType PrimaryActionButtonRenderer::GetButtonType()
 
 VirtualGamepadButtonType PrimaryActionButtonRenderer::GetTownButtonType()
 {
-	if (stextflag != STORE_NONE || pcursmonst != -1)
+	if (stextflag != TalkID::None || pcursmonst != -1)
 		return GetTalkButtonType(virtualPadButton->isHeld);
 	return GetBlankButtonType(virtualPadButton->isHeld);
 }

Source/diablo.cpp

@@ -335,7 +335,7 @@ void LeftMouseDown(uint16_t modState)
 		return;
 	}
 
-	if (stextflag != STORE_NONE) {
+	if (stextflag != TalkID::None) {
 		CheckStoreBtn();
 		return;
 	}
@@ -399,7 +399,7 @@ void LeftMouseUp(uint16_t modState)
 	}
 	if (lvlbtndown)
 		ReleaseLvlBtn();
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		ReleaseStoreBtn();
 }
 
@@ -415,7 +415,7 @@ void RightMouseDown(bool isShiftHeld)
 		doom_close();
 		return;
 	}
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	if (spselflag) {
 		SetSpell();
@@ -556,7 +556,7 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 		if ((modState & KMOD_ALT) != 0) {
 			sgOptions.Graphics.fullscreen.SetValue(!IsFullScreen());
 			SaveOptions();
-		} else if (stextflag != STORE_NONE) {
+		} else if (stextflag != TalkID::None) {
 			StoreEnter();
 		} else if (QuestLogIsOpen) {
 			QuestlogEnter();
@@ -565,7 +565,7 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 		}
 		return;
 	case SDLK_UP:
-		if (stextflag != STORE_NONE) {
+		if (stextflag != TalkID::None) {
 			StoreUp();
 		} else if (QuestLogIsOpen) {
 			QuestlogUp();
@@ -580,7 +580,7 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 		}
 		return;
 	case SDLK_DOWN:
-		if (stextflag != STORE_NONE) {
+		if (stextflag != TalkID::None) {
 			StoreDown();
 		} else if (QuestLogIsOpen) {
 			QuestlogDown();
@@ -595,14 +595,14 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 		}
 		return;
 	case SDLK_PAGEUP:
-		if (stextflag != STORE_NONE) {
+		if (stextflag != TalkID::None) {
 			StorePrior();
 		} else if (ChatLogFlag) {
 			ChatLogScrollTop();
 		}
 		return;
 	case SDLK_PAGEDOWN:
-		if (stextflag != STORE_NONE) {
+		if (stextflag != TalkID::None) {
 			StoreNext();
 		} else if (ChatLogFlag) {
 			ChatLogScrollBottom();
@@ -623,7 +623,7 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 
 void HandleMouseButtonDown(Uint8 button, uint16_t modState)
 {
-	if (stextflag != STORE_NONE && (button == SDL_BUTTON_X1
+	if (stextflag != TalkID::None && (button == SDL_BUTTON_X1
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	        || button == 8
 #endif
@@ -1438,7 +1438,7 @@ void HelpKeyPressed()
 {
 	if (HelpFlag) {
 		HelpFlag = false;
-	} else if (stextflag != STORE_NONE) {
+	} else if (stextflag != TalkID::None) {
 		InfoString = {};
 		AddPanelString(_("No help available")); /// BUGFIX: message isn't displayed
 		AddPanelString(_("while in stores"));
@@ -1462,7 +1462,7 @@ void HelpKeyPressed()
 
 void InventoryKeyPressed()
 {
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	invflag = !invflag;
 	if (!IsLeftPanelOpen() && CanPanelsCoverView()) {
@@ -1483,7 +1483,7 @@ void InventoryKeyPressed()
 
 void CharacterSheetKeyPressed()
 {
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	chrflag = !chrflag;
 	if (!IsRightPanelOpen() && CanPanelsCoverView()) {
@@ -1504,7 +1504,7 @@ void CharacterSheetKeyPressed()
 
 void QuestLogKeyPressed()
 {
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	if (!QuestLogIsOpen) {
 		StartQuestlog();
@@ -1529,7 +1529,7 @@ void QuestLogKeyPressed()
 
 void DisplaySpellsKeyPressed()
 {
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	chrflag = false;
 	QuestLogIsOpen = false;
@@ -1545,7 +1545,7 @@ void DisplaySpellsKeyPressed()
 
 void SpellBookKeyPressed()
 {
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 	sbookflag = !sbookflag;
 	if (!IsLeftPanelOpen() && CanPanelsCoverView()) {
@@ -1655,7 +1655,7 @@ void InitKeymapActions()
 	    SDLK_F3,
 	    [] { gamemenu_load_game(false); },
 	    nullptr,
-	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && stextflag == STORE_NONE && IsGameRunning(); });
+	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && stextflag == TalkID::None && IsGameRunning(); });
 #ifndef NOEXIT
 	sgOptions.Keymapper.AddAction(
 	    "QuitGame",
@@ -2193,7 +2193,7 @@ void InitPadmapActions()
 	    ControllerButton_NONE,
 	    [] { gamemenu_load_game(false); },
 	    nullptr,
-	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && stextflag == STORE_NONE && IsGameRunning(); });
+	    [&]() { return !gbIsMultiplayer && gbValidSaveFile && stextflag == TalkID::None && IsGameRunning(); });
 	sgOptions.Padmapper.AddAction(
 	    "Item Highlighting",
 	    N_("Item highlighting"),
@@ -2610,7 +2610,7 @@ bool PressEscKey()
 		rv = true;
 	}
 
-	if (stextflag != STORE_NONE) {
+	if (stextflag != TalkID::None) {
 		StoreESC();
 		rv = true;
 	}

Source/engine/render/scrollrt.cpp

@@ -647,7 +647,7 @@ void DrawItem(const Surface &out, Point tilePosition, Point targetBufferPosition
 	const ClxSprite sprite = item.AnimInfo.currentSprite();
 	int px = targetBufferPosition.x - CalculateWidth2(sprite.width());
 	const Point position { px, targetBufferPosition.y };
-	if (stextflag == STORE_NONE && (bItem - 1 == pcursitem || AutoMapShowItems)) {
+	if (stextflag == TalkID::None && (bItem - 1 == pcursitem || AutoMapShowItems)) {
 		ClxDrawOutlineSkipColorZero(out, GetOutlineColor(item, false), position, sprite);
 	}
 	ClxDrawLight(out, position, sprite);
@@ -1190,7 +1190,7 @@ void DrawView(const Surface &out, Point startPosition)
 	DrawItemNameLabels(out);
 	DrawFloatingNumbers(out, startPosition, offset);
 
-	if (stextflag != STORE_NONE && !qtextflag)
+	if (stextflag != TalkID::None && !qtextflag)
 		DrawSText(out);
 	if (invflag) {
 		DrawInv(out);

Source/inv.cpp

@@ -2014,7 +2014,7 @@ bool UseInvItem(size_t pnum, int cii)
 		return true;
 	if (pcurs != CURSOR_HAND)
 		return true;
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return true;
 	if (cii < INVITEM_INV_FIRST)
 		return false;

Source/qol/chatlog.cpp

@@ -97,7 +97,7 @@ void ToggleChatLog()
 	if (ChatLogFlag) {
 		ChatLogFlag = false;
 	} else {
-		stextflag = STORE_NONE;
+		stextflag = TalkID::None;
 		CloseInventory();
 		chrflag = false;
 		sbookflag = false;

Source/qol/itemlabels.cpp

@@ -91,7 +91,7 @@ void ResetItemlabelHighlighted()
 
 bool IsHighlightingLabelsEnabled()
 {
-	return stextflag == STORE_NONE && altPressed != *sgOptions.Gameplay.showItemLabels;
+	return stextflag == TalkID::None && altPressed != *sgOptions.Gameplay.showItemLabels;
 }
 
 void AddItemToLabelQueue(int id, Point position)
@@ -190,7 +190,7 @@ void DrawItemNameLabels(const Surface &out)
 			if (!gmenu_is_active()
 			    && PauseMode == 0
 			    && !MyPlayerIsDead
-			    && stextflag == STORE_NONE
+			    && stextflag == TalkID::None
 			    && IsMouseOverGameArea()
 			    && LastMouseButtonAction == MouseActionType::None) {
 				isLabelHighlighted = true;
@@ -198,7 +198,7 @@ void DrawItemNameLabels(const Surface &out)
 				pcursitem = label.id;
 			}
 		}
-		if (pcursitem == label.id && stextflag == STORE_NONE)
+		if (pcursitem == label.id && stextflag == TalkID::None)
 			FillRect(clippedOut, label.pos.x, label.pos.y + MarginY, label.width, Height, PAL8_BLUE + 6);
 		else
 			DrawHalfTransparentRectTo(clippedOut, label.pos.x, label.pos.y + MarginY, label.width, Height);

Source/qol/stash.cpp

@@ -451,7 +451,7 @@ bool UseStashItem(uint16_t c)
 		return true;
 	if (pcurs != CURSOR_HAND)
 		return true;
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return true;
 
 	Item *item = &Stash.stashList[c];

Source/stores.h

@@ -19,35 +19,35 @@ namespace devilution {
 #define SMITH_PREMIUM_ITEMS 15
 #define STORE_LINES 104
 
-enum talk_id : uint8_t {
-	STORE_NONE,
-	STORE_SMITH,
-	STORE_SBUY,
-	STORE_SSELL,
-	STORE_SREPAIR,
-	STORE_WITCH,
-	STORE_WBUY,
-	STORE_WSELL,
-	STORE_WRECHARGE,
-	STORE_NOMONEY,
-	STORE_NOROOM,
-	STORE_CONFIRM,
-	STORE_BOY,
-	STORE_BBOY,
-	STORE_HEALER,
-	STORE_STORY,
-	STORE_HBUY,
-	STORE_SIDENTIFY,
-	STORE_SPBUY,
-	STORE_GOSSIP,
-	STORE_IDSHOW,
-	STORE_TAVERN,
-	STORE_DRUNK,
-	STORE_BARMAID,
+enum class TalkID : uint8_t {
+	None,
+	Blacksmith,
+	BlacksmithBuy,
+	BlacksmithSell,
+	BlacksmithRepair,
+	Witch,
+	WitchBuy,
+	WitchSell,
+	WitchRecharge,
+	NoMoney,
+	NoRoom,
+	Confirm,
+	Boy,
+	BoyBuy,
+	Healer,
+	Storyteller,
+	HealerBuy,
+	StorytellerIdentify,
+	SmithPremiumBuy,
+	Gossip,
+	StorytellerShow,
+	Tavern,
+	Drunk,
+	Barmaid,
 };
 
 /** Currently active store */
-extern talk_id stextflag;
+extern TalkID stextflag;
 
 /** Current index into storehidx/storehold */
 extern DVL_API_FOR_TEST int storenumh;
@@ -90,7 +90,7 @@ void PrintSString(const Surface &out, int margin, int line, string_view text, Ui
 void DrawSLine(const Surface &out, int sy);
 void DrawSTextHelp();
 void ClearSText(int s, int e);
-void StartStore(talk_id s);
+void StartStore(TalkID s);
 void DrawSText(const Surface &out);
 void StoreESC();
 void StoreUp();

Source/towners.cpp

@@ -343,7 +343,7 @@ void TalkToBarOwner(Player &player, Towner &barOwner)
 	}
 
 	TownerTalk(TEXT_OGDEN1);
-	StartStore(STORE_TAVERN);
+	StartStore(TalkID::Tavern);
 }
 
 void TalkToDeadguy(Player &player, Towner & /*deadguy*/)
@@ -411,7 +411,7 @@ void TalkToBlackSmith(Player &player, Towner &blackSmith)
 	}
 
 	TownerTalk(TEXT_GRISWOLD1);
-	StartStore(STORE_SMITH);
+	StartStore(TalkID::Blacksmith);
 }
 
 void TalkToWitch(Player &player, Towner & /*witch*/)
@@ -464,7 +464,7 @@ void TalkToWitch(Player &player, Towner & /*witch*/)
 	}
 
 	TownerTalk(TEXT_ADRIA1);
-	StartStore(STORE_WITCH);
+	StartStore(TalkID::Witch);
 }
 
 void TalkToBarmaid(Player &player, Towner & /*barmaid*/)
@@ -478,13 +478,13 @@ void TalkToBarmaid(Player &player, Towner & /*barmaid*/)
 	}
 
 	TownerTalk(TEXT_GILLIAN1);
-	StartStore(STORE_BARMAID);
+	StartStore(TalkID::Barmaid);
 }
 
 void TalkToDrunk(Player & /*player*/, Towner & /*drunk*/)
 {
 	TownerTalk(TEXT_FARNHAM1);
-	StartStore(STORE_DRUNK);
+	StartStore(TalkID::Drunk);
 }
 
 void TalkToHealer(Player &player, Towner &healer)
@@ -518,13 +518,13 @@ void TalkToHealer(Player &player, Towner &healer)
 	}
 
 	TownerTalk(TEXT_PEPIN1);
-	StartStore(STORE_HEALER);
+	StartStore(TalkID::Healer);
 }
 
 void TalkToBoy(Player & /*player*/, Towner & /*boy*/)
 {
 	TownerTalk(TEXT_WIRT1);
-	StartStore(STORE_BOY);
+	StartStore(TalkID::Boy);
 }
 
 void TalkToStoryteller(Player &player, Towner & /*storyteller*/)
@@ -560,7 +560,7 @@ void TalkToStoryteller(Player &player, Towner & /*storyteller*/)
 	}
 
 	TownerTalk(TEXT_STORY1);
-	StartStore(STORE_STORY);
+	StartStore(TalkID::Storyteller);
 }
 
 void TalkToCow(Player &player, Towner &cow)

Source/track.cpp

@@ -66,7 +66,7 @@ void RepeatMouseAction()
 	if (sgbMouseDown == CLICK_NONE && ControllerActionHeld == GameActionType_NONE)
 		return;
 
-	if (stextflag != STORE_NONE)
+	if (stextflag != TalkID::None)
 		return;
 
 	if (LastMouseButtonAction == MouseActionType::None)