From 6a0c91e07ef892d8db0f54d9a5f8793c6cb594cd Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 19 Sep 2005 09:27:43 +0000
Subject: [PATCH] STATE_SELECTING_GENERIC -> STATE_SELECTING

---
 stepmania/src/MusicWheel.cpp | 18 +++++++++---------
 stepmania/src/RoomWheel.cpp  |  2 +-
 stepmania/src/WheelBase.cpp  | 12 ++++++------
 stepmania/src/WheelBase.h    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 16935472e6..4e77637052 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -99,7 +99,7 @@ void MusicWheel::Load( CString sType )
 	m_soundChangeSort.Load(		THEME->GetPathS(sType,"sort") );
 	m_soundExpand.Load(			THEME->GetPathS(sType,"expand"), true );
 
-	m_WheelState = STATE_SELECTING_GENERIC;
+	m_WheelState = STATE_SELECTING;
 
 	if( GAMESTATE->IsExtraStage() ||  GAMESTATE->IsExtraStage2() )
 	{
@@ -821,7 +821,7 @@ void MusicWheel::DrawItem( int i )
 
 	switch( m_WheelState )
 	{
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 	case STATE_ROULETTE_SPINNING:
 	case STATE_ROULETTE_SLOWING_DOWN:
 	case STATE_RANDOM_SPINNING:
@@ -838,7 +838,7 @@ bool MusicWheel::IsSettled() const
 {
 	if( m_Moving )
 		return false;
-	if( m_WheelState != STATE_SELECTING_GENERIC && m_WheelState != STATE_LOCKED )
+	if( m_WheelState != STATE_SELECTING && m_WheelState != STATE_LOCKED )
 		return false;
 	if( m_fPositionOffsetFromSelection != 0 )
 		return false;
@@ -912,7 +912,7 @@ void MusicWheel::UpdateSwitch()
 		break;
 
 	case STATE_FLYING_ON_AFTER_NEXT_SORT:
-		m_WheelState = STATE_SELECTING_GENERIC;	// now, wait for input
+		m_WheelState = STATE_SELECTING;	// now, wait for input
 		break;
 
 	case STATE_TWEENING_ON_SCREEN:
@@ -925,14 +925,14 @@ void MusicWheel::UpdateSwitch()
 		}
 		else
 		{
-			m_WheelState = STATE_SELECTING_GENERIC;
+			m_WheelState = STATE_SELECTING;
 		}
 		break;
 	case STATE_TWEENING_OFF_SCREEN:
 		m_WheelState = STATE_WAITING_OFF_SCREEN;
 		m_fTimeLeftInState = 0;
 		break;
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 		m_fTimeLeftInState = 0;
 		break;
 	case STATE_ROULETTE_SPINNING:
@@ -1003,7 +1003,7 @@ bool MusicWheel::ChangeSort( SortOrder new_so )	// return true if change success
 
 	switch( m_WheelState )
 	{
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 	case STATE_FLYING_ON_AFTER_NEXT_SORT:
 		break;	// fall through
 	default:
@@ -1249,7 +1249,7 @@ bool MusicWheel::MoveSpecific(int n)
 	 * Move(0). -Chris */
 	switch( m_WheelState )
 	{
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 		break;
 	case STATE_FLYING_OFF_BEFORE_NEXT_SORT:
 	case STATE_FLYING_ON_AFTER_NEXT_SORT:
@@ -1354,7 +1354,7 @@ try_next:
 void MusicWheel::FinishChangingSorts()
 {
 	FinishTweening();
-	m_WheelState = STATE_SELECTING_GENERIC;
+	m_WheelState = STATE_SELECTING;
 	m_fTimeLeftInState = 0;
 }
 
diff --git a/stepmania/src/RoomWheel.cpp b/stepmania/src/RoomWheel.cpp
index bbf57d6525..b7167b42f8 100644
--- a/stepmania/src/RoomWheel.cpp
+++ b/stepmania/src/RoomWheel.cpp
@@ -24,7 +24,7 @@ void RoomWheel::Load( CString sType )
 		m_WheelBaseItems.push_back( new RoomWheelItem );
 	}
 
-	m_WheelState = STATE_SELECTING_GENERIC;
+	m_WheelState = STATE_SELECTING;
 
 	AddPerminateItem( new RoomWheelData(TYPE_GENERIC, "Create Room", "Create a new game room", THEME->GetMetricC( m_sName, "CreateRoomColor")) );
 
diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp
index 05b8f500bc..e115718996 100644
--- a/stepmania/src/WheelBase.cpp
+++ b/stepmania/src/WheelBase.cpp
@@ -52,7 +52,7 @@ void WheelBase::Load( CString sType )
 		m_WheelBaseItems.push_back( new WheelItemBase );
 	}
 
-	m_WheelState = STATE_SELECTING_GENERIC;
+	m_WheelState = STATE_SELECTING;
 
 	BuildWheelItemsData(m_WheelBaseItemsData);
 	RebuildWheelItems();
@@ -165,7 +165,7 @@ void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBanner
 
 	switch( m_WheelState )
 	{
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 	case STATE_LOCKED:
 		{
 			SetItemPosition( *display, fThisBannerPositionOffsetFromSelection );
@@ -204,7 +204,7 @@ bool WheelBase::IsSettled() const
 {
 	if( m_Moving )
 		return false;
-	if( m_WheelState != STATE_SELECTING_GENERIC && m_WheelState != STATE_LOCKED )
+	if( m_WheelState != STATE_SELECTING && m_WheelState != STATE_LOCKED )
 		return false;
 	if( m_fPositionOffsetFromSelection != 0 )
 		return false;
@@ -335,14 +335,14 @@ void WheelBase::UpdateSwitch()
 		}
 		else
 		{
-			m_WheelState = STATE_SELECTING_GENERIC;
+			m_WheelState = STATE_SELECTING;
 		}
 		break;
 	case STATE_TWEENING_OFF_SCREEN:
 		m_WheelState = STATE_WAITING_OFF_SCREEN;
 		m_fTimeLeftInState = 0;
 		break;
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 		m_fTimeLeftInState = 0;
 		break;
 	case STATE_WAITING_OFF_SCREEN:
@@ -554,7 +554,7 @@ bool WheelBase::MoveSpecific( int n )
 	 * Move(0). -Chris */
 	switch( m_WheelState )
 	{
-	case STATE_SELECTING_GENERIC:
+	case STATE_SELECTING:
 		break;
 	case STATE_FLYING_OFF_BEFORE_NEXT_SORT:
 	case STATE_FLYING_ON_AFTER_NEXT_SORT:
diff --git a/stepmania/src/WheelBase.h b/stepmania/src/WheelBase.h
index 1e0134217a..6f4410633f 100644
--- a/stepmania/src/WheelBase.h
+++ b/stepmania/src/WheelBase.h
@@ -87,7 +87,7 @@ protected:
 	float				m_TimeBeforeMovingBegins;
 	float				m_SpinSpeed;
 	enum WheelState { 
-		STATE_SELECTING_GENERIC,
+		STATE_SELECTING,
 		STATE_FLYING_OFF_BEFORE_NEXT_SORT, 
 		STATE_FLYING_ON_AFTER_NEXT_SORT, 
 		STATE_TWEENING_ON_SCREEN,