Change persistence from save file to gameplay option/INI file

Author: Rasti-i

Source/automap.cpp

@@ -1557,6 +1557,7 @@ Rectangle MinimapRect {};
 void InitAutomapOnce()
 {
 	AutomapActive = false;
+	SetAutomapType(*GetOptions().Gameplay.automapType);
 	AutoMapScale = 50;
 
 	// Set the dimensions and screen position of the minimap relative to the screen dimensions

Source/loadsave.cpp

@@ -32,6 +32,7 @@
 #include "monster.h"
 #include "monsters/validation.hpp"
 #include "mpq/mpq_common.hpp"
+#include "options.h"
 #include "pfile.h"
 #include "plrmsg.h"
 #include "qol/stash.h"
@@ -2658,16 +2659,7 @@ tl::expected<void, std::string> LoadGame(bool firstflag)
 
 	AutomapActive = file.NextBool8();
 	AutoMapScale = file.NextBE<int32_t>();
-	if (file.IsValid(sizeof(uint8_t))) {
-		const auto automapType = file.NextLE<uint8_t>();
-		if (automapType <= static_cast<uint8_t>(AutomapType::LAST)) {
-			SetAutomapType(static_cast<AutomapType>(automapType));
-		} else {
-			SetAutomapType(AutomapType::Opaque);
-		}
-	} else {
-		SetAutomapType(AutomapType::Opaque);
-	}
+	SetAutomapType(*GetOptions().Gameplay.automapType);
 	AutomapZoomReset();
 	ResyncQuests();
 
@@ -2931,14 +2923,15 @@ void SaveGameData(SaveWriter &saveWriter)
 
 	file.WriteLE<uint8_t>(AutomapActive ? 1 : 0);
 	file.WriteBE<int32_t>(AutoMapScale);
-	file.WriteLE<uint8_t>(static_cast<uint8_t>(GetAutomapType()));
 
 	SaveAdditionalMissiles(saveWriter);
 	SaveLevelSeeds(saveWriter);
 }
 
 void SaveGame()
 {
+	GetOptions().Gameplay.automapType.SetValue(GetAutomapType());
+	SaveOptions();
 	gbValidSaveFile = true;
 	pfile_write_hero(/*writeGameData=*/true);
 	sfile_write_stash();

Source/options.cpp

@@ -865,6 +865,13 @@ GameplayOptions::GameplayOptions()
     , autoRefillBelt("Auto Refill Belt", OptionEntryFlags::None, N_("Auto Refill Belt"), N_("Refill belt from inventory when belt item is consumed."), false)
     , disableCripplingShrines("Disable Crippling Shrines", OptionEntryFlags::None, N_("Disable Crippling Shrines"), N_("When enabled Cauldrons, Fascinating Shrines, Goat Shrines, Ornate Shrines, Sacred Shrines and Murphy's Shrines are not able to be clicked on and labeled as disabled."), false)
     , quickCast("Quick Cast", OptionEntryFlags::None, N_("Quick Cast"), N_("Spell hotkeys instantly cast the spell, rather than switching the readied spell."), false)
+	, automapType("Automap Type", OptionEntryFlags::None, N_("Automap Type"), N_("Default automap type used when loading a game."), AutomapType::Opaque,
+		  {
+			  { AutomapType::Opaque, N_("Opaque") },
+			  { AutomapType::Transparent, N_("Transparent") },
+			  { AutomapType::Minimap, N_("Minimap") },
+			  { AutomapType::MinimapBorderless, N_("Minimap Borderless") },
+		  })
     , numHealPotionPickup("Heal Potion Pickup", OptionEntryFlags::None, N_("Heal Potion Pickup"), N_("Number of Healing potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
     , numFullHealPotionPickup("Full Heal Potion Pickup", OptionEntryFlags::None, N_("Full Heal Potion Pickup"), N_("Number of Full Healing potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
     , numManaPotionPickup("Mana Potion Pickup", OptionEntryFlags::None, N_("Mana Potion Pickup"), N_("Number of Mana potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
@@ -916,6 +923,7 @@ std::vector<OptionEntryBase *> GameplayOptions::GetEntries()
 		&disableCripplingShrines,
 		&grabInput,
 		&pauseOnFocusLoss,
+		&automapType,
 		&skipLoadingScreenThresholdMs,
 	};
 }

Source/options.h

@@ -25,6 +25,7 @@
 #include <ankerl/unordered_dense.h>
 #include <function_ref.hpp>
 
+#include "automap.h"
 #include "appfat.h"
 #include "controls/controller_buttons.h"
 #include "engine/size.hpp"
@@ -623,6 +624,8 @@ struct GameplayOptions : OptionCategoryBase {
 	OptionEntryBoolean disableCripplingShrines;
 	/** @brief Spell hotkeys instantly cast the spell. */
 	OptionEntryBoolean quickCast;
+	/** @brief Default automap type to use when loading a game. */
+	OptionEntryEnum<AutomapType> automapType;
 	/** @brief Number of Healing potions to pick up automatically */
 	OptionEntryInt<int> numHealPotionPickup;
 	/** @brief Number of Full Healing potions to pick up automatically */