actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STATE_SELECTING_GENERIC -> STATE_SELECTING

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-19 09:27:43 +00:00
parent ccc567b85c
commit 6a0c91e07e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+9 -9
View File
@@ -99,7 +99,7 @@ void MusicWheel::Load( CString sType )
m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") ); m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") );
m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true ); m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true );
m_WheelState = STATE_SELECTING_GENERIC; m_WheelState = STATE_SELECTING;
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
{ {
@@ -821,7 +821,7 @@ void MusicWheel::DrawItem( int i )
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
case STATE_ROULETTE_SPINNING: case STATE_ROULETTE_SPINNING:
case STATE_ROULETTE_SLOWING_DOWN: case STATE_ROULETTE_SLOWING_DOWN:
case STATE_RANDOM_SPINNING: case STATE_RANDOM_SPINNING:
@@ -838,7 +838,7 @@ bool MusicWheel::IsSettled() const
{ {
if( m_Moving ) if( m_Moving )
return false; return false;
if( m_WheelState != STATE_SELECTING_GENERIC && m_WheelState != STATE_LOCKED ) if( m_WheelState != STATE_SELECTING && m_WheelState != STATE_LOCKED )
return false; return false;
if( m_fPositionOffsetFromSelection != 0 ) if( m_fPositionOffsetFromSelection != 0 )
return false; return false;
@@ -912,7 +912,7 @@ void MusicWheel::UpdateSwitch()
break; break;
case STATE_FLYING_ON_AFTER_NEXT_SORT: 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; break;
case STATE_TWEENING_ON_SCREEN: case STATE_TWEENING_ON_SCREEN:
@@ -925,14 +925,14 @@ void MusicWheel::UpdateSwitch()
} }
else else
{ {
m_WheelState = STATE_SELECTING_GENERIC; m_WheelState = STATE_SELECTING;
} }
break; break;
case STATE_TWEENING_OFF_SCREEN: case STATE_TWEENING_OFF_SCREEN:
m_WheelState = STATE_WAITING_OFF_SCREEN; m_WheelState = STATE_WAITING_OFF_SCREEN;
m_fTimeLeftInState = 0; m_fTimeLeftInState = 0;
break; break;
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
m_fTimeLeftInState = 0; m_fTimeLeftInState = 0;
break; break;
case STATE_ROULETTE_SPINNING: case STATE_ROULETTE_SPINNING:
@@ -1003,7 +1003,7 @@ bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change success
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
case STATE_FLYING_ON_AFTER_NEXT_SORT: case STATE_FLYING_ON_AFTER_NEXT_SORT:
break; // fall through break; // fall through
default: default:
@@ -1249,7 +1249,7 @@ bool MusicWheel::MoveSpecific(int n)
* Move(0). -Chris */ * Move(0). -Chris */
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
break; break;
case STATE_FLYING_OFF_BEFORE_NEXT_SORT: case STATE_FLYING_OFF_BEFORE_NEXT_SORT:
case STATE_FLYING_ON_AFTER_NEXT_SORT: case STATE_FLYING_ON_AFTER_NEXT_SORT:
@@ -1354,7 +1354,7 @@ try_next:
void MusicWheel::FinishChangingSorts() void MusicWheel::FinishChangingSorts()
{ {
FinishTweening(); FinishTweening();
m_WheelState = STATE_SELECTING_GENERIC; m_WheelState = STATE_SELECTING;
m_fTimeLeftInState = 0; m_fTimeLeftInState = 0;
} }
stepmania/src/RoomWheel.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ void RoomWheel::Load( CString sType )
m_WheelBaseItems.push_back( new RoomWheelItem ); 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")) ); AddPerminateItem( new RoomWheelData(TYPE_GENERIC, "Create Room", "Create a new game room", THEME->GetMetricC( m_sName, "CreateRoomColor")) );
stepmania/src/WheelBase.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ void WheelBase::Load( CString sType )
m_WheelBaseItems.push_back( new WheelItemBase ); m_WheelBaseItems.push_back( new WheelItemBase );
} }
m_WheelState = STATE_SELECTING_GENERIC; m_WheelState = STATE_SELECTING;
BuildWheelItemsData(m_WheelBaseItemsData); BuildWheelItemsData(m_WheelBaseItemsData);
RebuildWheelItems(); RebuildWheelItems();
@@ -165,7 +165,7 @@ void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBanner
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
case STATE_LOCKED: case STATE_LOCKED:
{ {
SetItemPosition( *display, fThisBannerPositionOffsetFromSelection ); SetItemPosition( *display, fThisBannerPositionOffsetFromSelection );
@@ -204,7 +204,7 @@ bool WheelBase::IsSettled() const
{ {
if( m_Moving ) if( m_Moving )
return false; return false;
if( m_WheelState != STATE_SELECTING_GENERIC && m_WheelState != STATE_LOCKED ) if( m_WheelState != STATE_SELECTING && m_WheelState != STATE_LOCKED )
return false; return false;
if( m_fPositionOffsetFromSelection != 0 ) if( m_fPositionOffsetFromSelection != 0 )
return false; return false;
@@ -335,14 +335,14 @@ void WheelBase::UpdateSwitch()
} }
else else
{ {
m_WheelState = STATE_SELECTING_GENERIC; m_WheelState = STATE_SELECTING;
} }
break; break;
case STATE_TWEENING_OFF_SCREEN: case STATE_TWEENING_OFF_SCREEN:
m_WheelState = STATE_WAITING_OFF_SCREEN; m_WheelState = STATE_WAITING_OFF_SCREEN;
m_fTimeLeftInState = 0; m_fTimeLeftInState = 0;
break; break;
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
m_fTimeLeftInState = 0; m_fTimeLeftInState = 0;
break; break;
case STATE_WAITING_OFF_SCREEN: case STATE_WAITING_OFF_SCREEN:
@@ -554,7 +554,7 @@ bool WheelBase::MoveSpecific( int n )
* Move(0). -Chris */ * Move(0). -Chris */
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING_GENERIC: case STATE_SELECTING:
break; break;
case STATE_FLYING_OFF_BEFORE_NEXT_SORT: case STATE_FLYING_OFF_BEFORE_NEXT_SORT:
case STATE_FLYING_ON_AFTER_NEXT_SORT: case STATE_FLYING_ON_AFTER_NEXT_SORT:
stepmania/src/WheelBase.h
+1 -1
View File
@@ -87,7 +87,7 @@ protected:
float m_TimeBeforeMovingBegins; float m_TimeBeforeMovingBegins;
float m_SpinSpeed; float m_SpinSpeed;
enum WheelState { enum WheelState {
STATE_SELECTING_GENERIC, STATE_SELECTING,
STATE_FLYING_OFF_BEFORE_NEXT_SORT, STATE_FLYING_OFF_BEFORE_NEXT_SORT,
STATE_FLYING_ON_AFTER_NEXT_SORT, STATE_FLYING_ON_AFTER_NEXT_SORT,
STATE_TWEENING_ON_SCREEN, STATE_TWEENING_ON_SCREEN,