From 845020c6170aa982fa885cb78615b549d3c0cabb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 31 Jul 2013 23:13:20 +0200
Subject: [PATCH] - ovthingcolors were not properly set. - added all the
 missing color CVARs for the overlays which previously duplicated use of one
 of the other CVARs.

---
 src/am_map.cpp            | 40 +++++++++++++++++++++------------------
 wadsrc/static/menudef.txt |  7 +++++--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/am_map.cpp b/src/am_map.cpp
index 466fe36ab..e2d32f737 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -87,6 +87,7 @@ CVAR (Int,   am_map_secrets,		1,			CVAR_ARCHIVE);
 CVAR (Bool,  am_drawmapback,		true,		CVAR_ARCHIVE);
 CVAR (Bool,  am_showkeys,			true,		CVAR_ARCHIVE);
 CVAR (Bool,  am_showtriggerlines,	false,		CVAR_ARCHIVE);
+CVAR (Int,   am_showthingsprites,		0,		CVAR_ARCHIVE);
 
 //=============================================================================
 //
@@ -108,29 +109,32 @@ CVAR (Color, am_gridcolor,			0x8b5a2b,	CVAR_ARCHIVE);
 CVAR (Color, am_xhaircolor,			0x808080,	CVAR_ARCHIVE);
 CVAR (Color, am_notseencolor,		0x6c6c6c,	CVAR_ARCHIVE);
 CVAR (Color, am_lockedcolor,		0x007800,	CVAR_ARCHIVE);
+CVAR (Color, am_intralevelcolor,	0x0000ff,	CVAR_ARCHIVE);
+CVAR (Color, am_interlevelcolor,	0xff0000,	CVAR_ARCHIVE);
+CVAR (Color, am_secretsectorcolor,	0xff00ff,	CVAR_ARCHIVE);
+CVAR (Color, am_thingcolor_friend,	0xfcfcfc,	CVAR_ARCHIVE);
+CVAR (Color, am_thingcolor_monster,	0xfcfcfc,	CVAR_ARCHIVE);
+CVAR (Color, am_thingcolor_item,	0xfcfcfc,	CVAR_ARCHIVE);
+CVAR (Color, am_thingcolor_citem,	0xfcfcfc,	CVAR_ARCHIVE);
+
 CVAR (Color, am_ovyourcolor,		0xfce8d8,	CVAR_ARCHIVE);
 CVAR (Color, am_ovwallcolor,		0x00ff00,	CVAR_ARCHIVE);
+CVAR (Color, am_ovsecretwallcolor,	0x008844,	CVAR_ARCHIVE);
 CVAR (Color, am_ovspecialwallcolor,	0xffffff,	CVAR_ARCHIVE);
-CVAR (Color, am_ovthingcolor,		0xe88800,	CVAR_ARCHIVE);
 CVAR (Color, am_ovotherwallscolor,	0x008844,	CVAR_ARCHIVE);
+CVAR (Color, am_ovlockedcolor,		0x008844,	CVAR_ARCHIVE);
 CVAR (Color, am_ovefwallcolor,		0x008844,	CVAR_ARCHIVE);
 CVAR (Color, am_ovfdwallcolor,		0x008844,	CVAR_ARCHIVE);
 CVAR (Color, am_ovcdwallcolor,		0x008844,	CVAR_ARCHIVE);
 CVAR (Color, am_ovunseencolor,		0x00226e,	CVAR_ARCHIVE);
 CVAR (Color, am_ovtelecolor,		0xffff00,	CVAR_ARCHIVE);
-CVAR (Color, am_intralevelcolor,	0x0000ff,	CVAR_ARCHIVE);
-CVAR (Color, am_interlevelcolor,	0xff0000,	CVAR_ARCHIVE);
-CVAR (Color, am_secretsectorcolor,	0xff00ff,	CVAR_ARCHIVE);
+CVAR (Color, am_ovinterlevelcolor,	0xffff00,	CVAR_ARCHIVE);
 CVAR (Color, am_ovsecretsectorcolor,0x00ffff,	CVAR_ARCHIVE);
-CVAR (Color, am_thingcolor_friend,		0xfcfcfc,	CVAR_ARCHIVE);
-CVAR (Color, am_thingcolor_monster,		0xfcfcfc,	CVAR_ARCHIVE);
-CVAR (Color, am_thingcolor_item,		0xfcfcfc,	CVAR_ARCHIVE);
-CVAR (Color, am_thingcolor_citem,		0xfcfcfc,	CVAR_ARCHIVE);
+CVAR (Color, am_ovthingcolor,		0xe88800,	CVAR_ARCHIVE);
 CVAR (Color, am_ovthingcolor_friend,	0xe88800,	CVAR_ARCHIVE);
 CVAR (Color, am_ovthingcolor_monster,	0xe88800,	CVAR_ARCHIVE);
 CVAR (Color, am_ovthingcolor_item,		0xe88800,	CVAR_ARCHIVE);
 CVAR (Color, am_ovthingcolor_citem,		0xe88800,	CVAR_ARCHIVE);
-CVAR (Int,   am_showthingsprites,		0,			CVAR_ARCHIVE);
 
 //=============================================================================
 //
@@ -293,23 +297,23 @@ static FColorCVar *cv_overlay[] = {
 	&am_backcolor,	// this will not be used in overlay mode
 	&am_ovyourcolor,
 	&am_ovwallcolor,
-	&am_ovspecialwallcolor,
+	&am_ovotherwallscolor,
 	&am_ovfdwallcolor,
 	&am_ovcdwallcolor,
 	&am_ovefwallcolor,
 	&am_ovthingcolor,
-	&am_ovthingcolor,
-	&am_ovthingcolor,
-	&am_ovthingcolor,
-	&am_ovthingcolor,
+	&am_ovthingcolor_item,
+	&am_ovthingcolor_citem,
+	&am_ovthingcolor_monster,
+	&am_ovthingcolor_friend,
 	&am_ovspecialwallcolor,
-	&am_ovwallcolor,
+	&am_ovsecretwallcolor,
 	&am_gridcolor,	// this will not be used in overlay mode
 	&am_xhaircolor,	// this will not be used in overlay mode
-	&am_ovspecialwallcolor,
-	&am_ovspecialwallcolor,
-	&am_ovtelecolor,
+	&am_ovunseencolor,
+	&am_ovlockedcolor,
 	&am_ovtelecolor,
+	&am_ovinterlevelcolor,
 	&am_ovsecretsectorcolor
 };
 
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 6097643ba..6789c1436 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1014,12 +1014,15 @@ OptionMenu MapColorMenu
 	ColorPicker "2-sided walls with different ceilings",	"am_ovcdwallcolor"		
 	ColorPicker "2-sided walls with 3D floors",				"am_ovefwallcolor"		
 	ColorPicker "Not-yet-seen walls",			"am_ovunseencolor"	
-	ColorPicker "Locked doors",				"am_ovotherwallscolor"
-	ColorPicker "Teleporter",					"am_ovtelecolor"		
+	ColorPicker "Locked doors",				"am_ovlockedcolor"
+	ColorPicker "Teleporter to the same map",					"am_ovtelecolor"		
+	ColorPicker "Teleporter to a different map",			"am_ovinterlevelcolor"	
 	ColorPicker "Secret sector",				"am_ovsecretsectorcolor"	
 	ColorPicker "Special trigger lines",		"am_ovspecialwallcolor"
 	StaticText " "
 	StaticText "Overlay Cheat Mode", 1
+	ColorPicker "Invisible 2-sided walls",		"am_ovotherwallscolor"		
+	ColorPicker "Secret walls",					"am_ovsecretwallcolor"	
 	ColorPicker "Actors",						"am_ovthingcolor"		
 	ColorPicker "Monsters",						"am_ovthingcolor_monster"		
 	ColorPicker "Friends",						"am_ovthingcolor_friend"