From dff46af2def557bc22e4fad8a6540c86a4123f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vini=CC=81cius=20Ferra=CC=83o?= Date: Tue, 11 Jul 2023 02:11:28 -0300 Subject: [PATCH] Fixes testing characters from Hellfire showing up in Diablo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit restricts the use of Test Barbarian and Test Barb to the Hellfire expansion only. Signed-off-by: Vinícius Ferrão --- Source/DiabloUI/hero/selhero.cpp | 12 ++++++------ Source/options.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp index 0c1c1069e..e63478602 100644 --- a/Source/DiabloUI/hero/selhero.cpp +++ b/Source/DiabloUI/hero/selhero.cpp @@ -161,12 +161,12 @@ void SelheroListSelect(int value) vecSelHeroDlgItems.push_back(std::make_unique(_("Sorcerer"), static_cast(HeroClass::Sorcerer))); if (gbIsHellfire) { vecSelHeroDlgItems.push_back(std::make_unique(_("Monk"), static_cast(HeroClass::Monk))); - } - if (gbBard || *sgOptions.Gameplay.testBard) { - vecSelHeroDlgItems.push_back(std::make_unique(_("Bard"), static_cast(HeroClass::Bard))); - } - if (gbBarbarian || *sgOptions.Gameplay.testBarbarian) { - vecSelHeroDlgItems.push_back(std::make_unique(_("Barbarian"), static_cast(HeroClass::Barbarian))); + if (gbBard || *sgOptions.Gameplay.testBard) { + vecSelHeroDlgItems.push_back(std::make_unique(_("Bard"), static_cast(HeroClass::Bard))); + } + if (gbBarbarian || *sgOptions.Gameplay.testBarbarian) { + vecSelHeroDlgItems.push_back(std::make_unique(_("Barbarian"), static_cast(HeroClass::Barbarian))); + } } if (vecSelHeroDlgItems.size() > 4) itemH = 26; diff --git a/Source/options.cpp b/Source/options.cpp index 9a37c969a..30fbb3c5f 100644 --- a/Source/options.cpp +++ b/Source/options.cpp @@ -1048,8 +1048,8 @@ GameplayOptions::GameplayOptions() , cowQuest("Cow Quest", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::OnlyHellfire, N_("Cow Quest"), N_("Enable Jersey's quest. Lester the farmer is replaced by the Complete Nut."), false) , friendlyFire("Friendly Fire", OptionEntryFlags::CantChangeInMultiPlayer, N_("Friendly Fire"), N_("Allow arrow/spell damage between players in multiplayer even when the friendly mode is on."), true) , multiplayerFullQuests("MultiplayerFullQuests", OptionEntryFlags::CantChangeInMultiPlayer, N_("Full quests in Multiplayer"), N_("Enables the full/uncut singleplayer version of quests."), false) - , testBard("Test Bard", OptionEntryFlags::CantChangeInGame, N_("Test Bard"), N_("Force the Bard character type to appear in the hero selection menu."), false) - , testBarbarian("Test Barbarian", OptionEntryFlags::CantChangeInGame, N_("Test Barbarian"), N_("Force the Barbarian character type to appear in the hero selection menu."), false) + , testBard("Test Bard", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::OnlyHellfire, N_("Test Bard"), N_("Force the Bard character type to appear in the hero selection menu."), false) + , testBarbarian("Test Barbarian", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::OnlyHellfire, N_("Test Barbarian"), N_("Force the Barbarian character type to appear in the hero selection menu."), false) , experienceBar("Experience Bar", OptionEntryFlags::None, N_("Experience Bar"), N_("Experience Bar is added to the UI at the bottom of the screen."), false) , showItemGraphicsInStores("Show Item Graphics in Stores", OptionEntryFlags::None, N_("Show Item Graphics in Stores"), N_("Show item graphics to the left of item descriptions in store menus."), false) , showHealthValues("Show health values", OptionEntryFlags::None, N_("Show health values"), N_("Displays current / max health value on health globe."), false)