From 0bf87acb00c4f2bf5a2d617dc5a9e0ff1d45f2fc Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 10 May 2006 03:17:34 +0000
Subject: [PATCH] - Added a new setting for am_overlay: 2 will disable the
 normal automap and   show only the overlayed version.

SVN r99 (trunk)
---
 docs/rh-log.txt   |  2 ++
 src/am_map.cpp    |  4 ++--
 src/m_options.cpp | 10 ++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 3b0165a940..9fc6516c45 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 May 9, 2006
+- Added a new setting for am_overlay: 2 will disable the normal automap and
+  show only the overlayed version.
 - Fixed?: WallSpriteColumn apparently needs to set dc_texturefrac. At least
   Valgrind seems to say so.
 - Fixed: The FWadCollection destructor needs to use free to free the LumpInfo
diff --git a/src/am_map.cpp b/src/am_map.cpp
index ecc1821fd8..b0a4f383f0 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -97,7 +97,7 @@ inline fixed_t MTOF(fixed_t x)
 static int WeightingScale;
 
 CVAR (Bool,  am_rotate,				false,		CVAR_ARCHIVE);
-CVAR (Bool,  am_overlay,			false,		CVAR_ARCHIVE);
+CVAR (Int,   am_overlay,			0,			CVAR_ARCHIVE);
 CVAR (Bool,  am_showsecrets,		true,		CVAR_ARCHIVE);
 CVAR (Bool,  am_showmonsters,		true,		CVAR_ARCHIVE);
 CVAR (Bool,  am_showitems,			false,		CVAR_ARCHIVE);
@@ -892,7 +892,7 @@ void AM_ToggleMap ()
 	}
 	else
 	{
-		if (am_overlay && viewactive)
+		if (am_overlay==1 && viewactive)
 		{
 			viewactive = false;
 			SB_state = screen->GetPageCount ();
diff --git a/src/m_options.cpp b/src/m_options.cpp
index 4cffd35da0..cefb68dda8 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -532,7 +532,7 @@ menu_t VideoMenu =
 static void StartMapColorsMenu (void);
 
 EXTERN_CVAR (Bool, am_rotate)
-EXTERN_CVAR (Bool, am_overlay)
+EXTERN_CVAR (Int, am_overlay)
 EXTERN_CVAR (Bool, am_usecustomcolors)
 EXTERN_CVAR (Bool, am_showitems)
 EXTERN_CVAR (Bool, am_showmonsters)
@@ -553,12 +553,18 @@ static value_t SecretTypes[] = {
 	{ 2, "Always" },
 };
 
+static value_t OverlayTypes[] = {
+	{ 0, "Off" },
+	{ 1, "On" },
+	{ 2, "Exclusively" }
+};
+
 static menuitem_t AutomapItems[] = {
 	{ discrete, "Map color set",		{&am_usecustomcolors},	{2.0}, {0.0},	{0.0}, {MapColorTypes} },
 	{ more,		"Set custom colors",	{NULL},					{0.0}, {0.0},	{0.0}, {(value_t*)StartMapColorsMenu} },
 	{ redtext,	" ",					{NULL},					{0.0}, {0.0},	{0.0}, {NULL} },
 	{ discrete, "Rotate automap",		{&am_rotate},		   	{2.0}, {0.0},	{0.0}, {OnOff} },
-	{ discrete, "Overlay automap",		{&am_overlay},			{2.0}, {0.0},	{0.0}, {OnOff} },
+	{ discrete, "Overlay automap",		{&am_overlay},			{3.0}, {0.0},	{0.0}, {OverlayTypes} },
 	{ redtext,	" ",					{NULL},					{0.0}, {0.0},	{0.0}, {NULL} },
 	{ discrete, "Show item counts",		{&am_showitems},		{2.0}, {0.0},	{0.0}, {OnOff} },
 	{ discrete, "Show monster counts",	{&am_showmonsters},		{2.0}, {0.0},	{0.0}, {OnOff} },