From 5b2b0b4611d394bdad43d6f50cdc746018da748c Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Wed, 14 Jun 2006 04:12:20 +0000
Subject: [PATCH] Show memory card icon for course edits.

---
 stepmania/src/MusicWheel.cpp     | 19 ++++++++++++-------
 stepmania/src/MusicWheelItem.cpp | 30 ++++++++++++++++--------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 0e9d21e377..4c1c4d8712 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -714,14 +714,19 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 	// init music status icons
 	for( unsigned i=0; i<arrayWheelItemDatas.size(); i++ )
 	{
-		Song* pSong = arrayWheelItemDatas[i].m_pSong;
-		if( pSong == NULL )
-			continue;
-
 		WheelItemData& WID = arrayWheelItemDatas[i];
-		WID.m_Flags.bHasBeginnerOr1Meter = pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType );
-		WID.m_Flags.bEdits = pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType );
-		WID.m_Flags.iStagesForSong = SongManager::GetNumStagesForSong( pSong );
+		if( WID.m_pSong != NULL )
+		{
+			WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType );
+			WID.m_Flags.bEdits = WID.m_pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType );
+			WID.m_Flags.iStagesForSong = SongManager::GetNumStagesForSong( WID.m_pSong );
+		}
+		else if( WID.m_pCourse != NULL )
+		{
+			WID.m_Flags.bHasBeginnerOr1Meter = false;
+			WID.m_Flags.bEdits = WID.m_pCourse->IsAnEdit();
+			WID.m_Flags.iStagesForSong = 1;
+		}
 	}
 
 	// init crowns
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 67c190ba72..e9efe719b7 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -18,20 +18,20 @@
 static RString GRADE_X_NAME( size_t p ) { return ssprintf("GradeP%dX",int(p+1)); }
 static RString GRADE_Y_NAME( size_t p ) { return ssprintf("GradeP%dY",int(p+1)); }
 
-static ThemeMetric<float>				ICON_X				("MusicWheelItem","IconX");
-static ThemeMetric<float>				ICON_Y				("MusicWheelItem","IconY");
-static ThemeMetric<apActorCommands>		ICON_ON_COMMAND		("MusicWheelItem","IconOnCommand");
-static ThemeMetric<float>				SONG_NAME_X			("MusicWheelItem","SongNameX");
-static ThemeMetric<float>				SONG_NAME_Y			("MusicWheelItem","SongNameY");
-static ThemeMetric<apActorCommands>		SONG_NAME_ON_COMMAND("MusicWheelItem","SongNameOnCommand");
-static ThemeMetric<float>				SECTION_X			("MusicWheelItem","SectionX");
-static ThemeMetric<float>				SECTION_Y			("MusicWheelItem","SectionY");
-static ThemeMetric<apActorCommands>		SECTION_ON_COMMAND	("MusicWheelItem","SectionOnCommand");
-static ThemeMetric<float>				ROULETTE_X			("MusicWheelItem","RouletteX");
-static ThemeMetric<float>				ROULETTE_Y			("MusicWheelItem","RouletteY");
-static ThemeMetric<apActorCommands>		ROULETTE_ON_COMMAND	("MusicWheelItem","RouletteOnCommand");
-static ThemeMetric1D<float>				GRADE_X				("MusicWheelItem",GRADE_X_NAME,NUM_PLAYERS);
-static ThemeMetric1D<float>				GRADE_Y				("MusicWheelItem",GRADE_Y_NAME,NUM_PLAYERS);
+static ThemeMetric<float>		ICON_X			("MusicWheelItem","IconX");
+static ThemeMetric<float>		ICON_Y			("MusicWheelItem","IconY");
+static ThemeMetric<apActorCommands>	ICON_ON_COMMAND		("MusicWheelItem","IconOnCommand");
+static ThemeMetric<float>		SONG_NAME_X		("MusicWheelItem","SongNameX");
+static ThemeMetric<float>		SONG_NAME_Y		("MusicWheelItem","SongNameY");
+static ThemeMetric<apActorCommands>	SONG_NAME_ON_COMMAND	("MusicWheelItem","SongNameOnCommand");
+static ThemeMetric<float>		SECTION_X		("MusicWheelItem","SectionX");
+static ThemeMetric<float>		SECTION_Y		("MusicWheelItem","SectionY");
+static ThemeMetric<apActorCommands>	SECTION_ON_COMMAND	("MusicWheelItem","SectionOnCommand");
+static ThemeMetric<float>		ROULETTE_X		("MusicWheelItem","RouletteX");
+static ThemeMetric<float>		ROULETTE_Y		("MusicWheelItem","RouletteY");
+static ThemeMetric<apActorCommands>	ROULETTE_ON_COMMAND	("MusicWheelItem","RouletteOnCommand");
+static ThemeMetric1D<float>		GRADE_X			("MusicWheelItem",GRADE_X_NAME,NUM_PLAYERS);
+static ThemeMetric1D<float>		GRADE_Y			("MusicWheelItem",GRADE_Y_NAME,NUM_PLAYERS);
 
 
 WheelItemData::WheelItemData( WheelItemType wit, Song* pSong, RString sSectionName, Course* pCourse, RageColor color ):
@@ -186,6 +186,8 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded
 				sDisplayName = data->m_pCourse->GetDisplayFullTitle();
 				sTranslitName = data->m_pCourse->GetTranslitFullTitle();
 				bt = &m_textCourse;
+				m_WheelNotifyIcon.SetFlags( data->m_Flags );
+				m_WheelNotifyIcon.SetHidden( false );
 				break;
 			case TYPE_SORT:
 				sDisplayName = data->m_sLabel;