From 5eb2e83d68ae0ebbf89562d1a27f32ea62990eff Mon Sep 17 00:00:00 2001
From: Mike Hawkins <archer0t8@users.sourceforge.net>
Date: Sat, 7 Jun 2008 22:47:53 +0000
Subject: [PATCH] Metric to hide the easy song flag on the MusicWheel (fix when
 using a transparent graphic for this flag and the song has multiple flags;
 this prevents the flag cycle from flashing an empty flag)

---
 stepmania/Themes/default/metrics.ini | 1 +
 stepmania/src/MusicWheel.cpp         | 3 ++-
 stepmania/src/MusicWheel.h           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index a17efea52e..5cd1b88ba7 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1873,6 +1873,7 @@ ChoiceEasyMeter="sort,EasyMeter"
 ChoiceMediumMeter="sort,MediumMeter"
 ChoiceHardMeter="sort,HardMeter"
 ChoiceLength="sort,Length"
+UseEasyMarkerFlag=false
 
 [RoomWheel]
 Fallback="MusicWheel"
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 1772c5a17b..260cf7abf8 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -75,6 +75,7 @@ void MusicWheel::Load( RString sType )
 	MOST_PLAYED_SONGS_TO_SHOW	.Load(sType,"MostPlayedSongsToShow");
 	MODE_MENU_CHOICE_NAMES		.Load(sType,"ModeMenuChoiceNames");
 	SORT_ORDERS			.Load(sType,"SortOrders");
+	SHOW_EASY_FLAG			.Load(sType,"UseEasyMarkerFlag");
 	vector<RString> vsModeChoiceNames;
 	split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames );
 	CHOICE				.Load(sType,CHOICE_NAME,vsModeChoiceNames);
@@ -693,7 +694,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 		MusicWheelItemData& WID = *arrayWheelItemDatas[i];
 		if( WID.m_pSong != NULL )
 		{
-			WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType );
+			WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType ) && SHOW_EASY_FLAG;
 			WID.m_Flags.bEdits = WID.m_pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType );
 			WID.m_Flags.iStagesForSong = GameState::GetNumStagesMultiplierForSong( WID.m_pSong );
 		}
diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h
index a46f7a29be..29c7c53419 100644
--- a/stepmania/src/MusicWheel.h
+++ b/stepmania/src/MusicWheel.h
@@ -79,6 +79,7 @@ protected:
 	ThemeMetricMap<RString>		CHOICE;
 	ThemeMetric1D<RageColor>	SECTION_COLORS;
 	ThemeMetric<LuaReference>	SORT_ORDERS;
+	ThemeMetric<bool>		SHOW_EASY_FLAG;
 };
 
 #endif