From 3efbf6c74e551551dd28b7430a5e60a2048c661c Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 9 Aug 2015 09:03:12 +0200
Subject: [PATCH] - fixed: am_restorecolors did not work

This CCMD tried to access the current menu to decide which colors to reset but that is not available at all when this function gets called. It now uses the automap's own CVAR arrays.
---
 src/am_map.cpp             | 14 ++++++++++++++
 src/menu/optionmenuitems.h | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/am_map.cpp b/src/am_map.cpp
index fdbacd34f9..045d485890 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -360,6 +360,20 @@ static FColorCVar *cv_overlay[] = {
 	&am_ovsecretsectorcolor
 };
 
+CCMD(am_restorecolors)
+{
+	for (unsigned i = 0; i < countof(cv_standard); i++)
+	{
+		cv_standard[i]->ResetToDefault();
+	}
+	for (unsigned i = 0; i < countof(cv_overlay); i++)
+	{
+		cv_overlay[i]->ResetToDefault();
+	}
+}
+
+
+
 #define NOT_USED 1,0,0	// use almost black as indicator for an unused color
 
 static unsigned char DoomColors[]= {
diff --git a/src/menu/optionmenuitems.h b/src/menu/optionmenuitems.h
index 5bc015369b..e87e78483e 100644
--- a/src/menu/optionmenuitems.h
+++ b/src/menu/optionmenuitems.h
@@ -1145,18 +1145,3 @@ private:
 	float mMaximum;
 	float mStep;
 };
-#ifndef NO_IMP
-CCMD(am_restorecolors)
-{
-	if (DMenu::CurrentMenu != NULL && DMenu::CurrentMenu->IsKindOf(RUNTIME_CLASS(DOptionMenu)))
-	{
-		DOptionMenu *m = (DOptionMenu*)DMenu::CurrentMenu;
-		const FOptionMenuDescriptor *desc = m->GetDescriptor();
-		// Find the color cvars by scanning the MapColors menu.
-		for (unsigned i = 0; i < desc->mItems.Size(); ++i)
-		{
-			desc->mItems[i]->SetValue(FOptionMenuItemColorPicker::CPF_RESET, 0);
-		}
-	}
-}
-#endif