Borderless Minimap and Automap type save

Author: Rasti-i

Source/automap.cpp

@@ -1257,7 +1257,7 @@ Displacement GetAutomapScreen()
 {
 	Displacement screen = {};
 
-	if (GetAutomapType() == AutomapType::Minimap) {
+	if (IsMinimapAutomapType()) {
 		screen = {
 			MinimapRect.position.x + MinimapRect.size.width / 2,
 			MinimapRect.position.y + MinimapRect.size.height / 2
@@ -1291,7 +1291,7 @@ void SearchAutomapItem(const Surface &out, const Displacement &myPlayerOffset, i
 	const int endY = std::clamp(tile.y + searchRadius, 0, MAXDUNY);
 
 	const AutomapType mapType = GetAutomapType();
-	const int scale = (mapType == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	const int scale = IsMinimapAutomapType(mapType) ? MinimapScale : AutoMapScale;
 
 	for (int i = startX; i < endX; i++) {
 		for (int j = startY; j < endY; j++) {
@@ -1308,7 +1308,7 @@ void SearchAutomapItem(const Surface &out, const Displacement &myPlayerOffset, i
 
 			screen += GetAutomapScreen();
 
-			if (mapType != AutomapType::Minimap && CanPanelsCoverView()) {
+			if (!IsMinimapAutomapType(mapType) && CanPanelsCoverView()) {
 				if (IsRightPanelOpen())
 					screen.x -= gnScreenWidth / 4;
 				if (IsLeftPanelOpen())
@@ -1352,7 +1352,7 @@ void DrawAutomapPlr(const Surface &out, const Displacement &myPlayerOffset, cons
 	if (player.isWalking())
 		playerOffset = GetOffsetForWalking(player.AnimInfo, player._pdir);
 
-	const int scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	const int scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 
 	Point base = {
 		((playerOffset.deltaX + myPlayerOffset.deltaX) * scale / 100 / 2) + (px - py) * AmLine(AmLineLength::DoubleTile),
@@ -1732,7 +1732,7 @@ void AutomapRight()
 
 void AutomapZoomIn()
 {
-	int &scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	int &scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 
 	if (scale >= 200)
 		return;
@@ -1742,7 +1742,7 @@ void AutomapZoomIn()
 
 void AutomapZoomOut()
 {
-	int &scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	int &scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 
 	if (scale <= 25)
 		return;
@@ -1773,7 +1773,7 @@ void DrawAutomap(const Surface &out)
 	if (myPlayer.isWalking())
 		myPlayerOffset = GetOffsetForWalking(myPlayer.AnimInfo, myPlayer._pdir, true);
 
-	const int scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	const int scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 	const int d = (scale * 64) / 100;
 	int cells = 2 * (gnScreenWidth / 2 / d) + 1;
 	if (((gnScreenWidth / 2) % d) != 0)
@@ -1801,6 +1801,12 @@ void DrawAutomap(const Surface &out)
 		DrawVerticalLine(out, MinimapRect.position + Displacement { -2, -1 }, MinimapRect.size.height + 1, MapColorsDim);
 		DrawVerticalLine(out, MinimapRect.position + Displacement { MinimapRect.size.width, -1 }, MinimapRect.size.height + 1, MapColorsDim);
 
+		if (AutoMapShowItems)
+			SearchAutomapItem(out, myPlayerOffset, 8, [](Point position) {
+				return dItem[position.x][position.y] != 0;
+			});
+	} else if (GetAutomapType() == AutomapType::MinimapBorderless) {
+
 		if (AutoMapShowItems)
 			SearchAutomapItem(out, myPlayerOffset, 8, [](Point position) {
 				return dItem[position.x][position.y] != 0;

Source/automap.h

@@ -85,7 +85,8 @@ enum class AutomapType : uint8_t {
 	FIRST = Opaque,
 	Transparent,
 	Minimap,
-	LAST = Minimap
+	MinimapBorderless,
+	LAST = MinimapBorderless
 };
 
 extern DVL_API_FOR_TEST AutomapType CurrentAutomapType;
@@ -106,16 +107,26 @@ inline AutomapType GetAutomapType()
 	return CurrentAutomapType;
 }
 
+inline bool IsMinimapAutomapType(AutomapType type)
+{
+	return type == AutomapType::Minimap || type == AutomapType::MinimapBorderless;
+}
+
+inline bool IsMinimapAutomapType()
+{
+	return IsMinimapAutomapType(GetAutomapType());
+}
+
 inline Displacement AmOffset(AmWidthOffset x, AmHeightOffset y)
 {
-	int scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	int scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 
 	return { scale * static_cast<int>(x) / 100, scale * static_cast<int>(y) / 100 };
 }
 
 inline int AmLine(AmLineLength l)
 {
-	int scale = (GetAutomapType() == AutomapType::Minimap) ? MinimapScale : AutoMapScale;
+	int scale = IsMinimapAutomapType() ? MinimapScale : AutoMapScale;
 
 	return scale * static_cast<int>(l) / 100;
 }

Source/diablo.cpp

@@ -1937,7 +1937,7 @@ void InitKeymapActions()
 	options.Keymapper.AddAction(
 	    "CycleAutomapType",
 	    N_("Cycle map type"),
-	    N_("Opaque -> Transparent -> Minimap -> None"),
+	    N_("Opaque -> Transparent -> Minimap -> Borderless Minimap -> None"),
 	    SDLK_M,
 	    CycleAutomapType,
 	    nullptr,

Source/engine/render/automap_render.cpp

@@ -165,7 +165,7 @@ void DrawMapFreeLine(const Surface &out, Point from, Point to, uint8_t colorInde
 
 void SetMapPixel(const Surface &out, Point position, uint8_t color)
 {
-	if (GetAutomapType() == AutomapType::Minimap && !MinimapRect.contains(position))
+	if (IsMinimapAutomapType() && !MinimapRect.contains(position))
 		return;
 
 	if (GetAutomapType() == AutomapType::Transparent) {

Source/loadsave.cpp

@@ -2658,6 +2658,16 @@ 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);
+	}
 	AutomapZoomReset();
 	ResyncQuests();
 
@@ -2921,6 +2931,7 @@ 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);