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

ScreenWithMenuElements::StartTransitioning -> StartTransitioningScreen, to make searching

Browse Source 
for it easier (vs. Transition::StartTransitioning).  (Trying to simplify tweening; this
may go back later.)
This commit is contained in:
Glenn Maynard
2005-10-13 22:17:13 +00:00
parent d26a729c5c
commit dfc67cd84d
25 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
SM == SM_BeginFadingOut )
{
if( !IsTransitioning() )
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
else if( SM == SM_GoToStartScreen )
{
stepmania/src/ScreenBookkeeping.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ void ScreenBookkeeping::MenuStart( PlayerNumber pn )
if( !IsTransitioning() )
{
SCREENMAN->PlayStartSound();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
}
@@ -92,7 +92,7 @@ void ScreenBookkeeping::MenuBack( PlayerNumber pn )
if(!IsTransitioning())
{
SCREENMAN->PlayStartSound();
StartTransitioning( SM_GoToPrevScreen );
StartTransitioningScreen( SM_GoToPrevScreen );
}
}
stepmania/src/ScreenCenterImage.cpp
+2 -2
View File
@@ -70,11 +70,11 @@ void ScreenCenterImage::Input( const InputEventPlus &input )
{
case MENU_BUTTON_START:
SCREENMAN->PlayStartSound();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
return;
case MENU_BUTTON_BACK:
StartTransitioning( SM_GoToPrevScreen );
StartTransitioningScreen( SM_GoToPrevScreen );
return;
}
}
stepmania/src/ScreenEditMenu.cpp
+2 -2
View File
@@ -91,7 +91,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
if( !ScreenTextEntry::s_bCancelledLast )
{
SOUND->StopMusic();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
}
@@ -281,7 +281,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
{
SOUND->StopMusic();
SCREENMAN->PlayStartSound();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
}
break;
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -969,7 +969,7 @@ void ScreenEvaluation::EndScreen()
}
}
}
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
/*
stepmania/src/ScreenEvaluationMultiplayer.cpp
+1 -1
View File
@@ -286,7 +286,7 @@ void ScreenEvaluationMultiplayer::MenuBack( PlayerNumber pn )
void ScreenEvaluationMultiplayer::MenuStart( PlayerNumber pn )
{
this->StartTransitioning( SM_GoToNextScreen );
this->StartTransitioningScreen( SM_GoToNextScreen );
}
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -505,7 +505,7 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
if(m_bMadeChoice && RageTimer::GetTimeSinceStartFast() > m_fRemainingWaitTime + 2 && !m_bTransitioning)
{
m_bTransitioning = true;
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
Screen::Update( fDeltaTime );
stepmania/src/ScreenEz2SelectPlayer.cpp
+2 -2
View File
@@ -139,7 +139,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
}
TweenOursOffScreen();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
break;
}
@@ -202,7 +202,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
if( bBothSidesJoined )
{
TweenOursOffScreen();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
else
{
stepmania/src/ScreenInstructions.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ void ScreenInstructions::MenuBack( PlayerNumber pn )
void ScreenInstructions::MenuStart( PlayerNumber pn )
{
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
/*
stepmania/src/ScreenJoinMultiplayer.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ void ScreenJoinMultiplayer::MenuStart( PlayerNumber pn )
return;
}
this->StartTransitioning( SM_GoToNextScreen );
this->StartTransitioningScreen( SM_GoToNextScreen );
}
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -299,7 +299,7 @@ void ScreenMapControllers::Input( const InputEventPlus &input )
INPUTMAPPER->SaveMappingsToDisk(); // save changes
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ )
m_Line[b].RunCommands( (b%2)? ODD_LINE_OUT:EVEN_LINE_OUT );
}
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -727,7 +727,7 @@ void ScreenNameEntryTraditional::MenuRight( const InputEventPlus &input )
void ScreenNameEntryTraditional::AllFinished()
{
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
FOREACH_HumanPlayer( pn )
{
stepmania/src/ScreenNetSelectMusic.cpp
+1 -1
View File
@@ -478,7 +478,7 @@ void ScreenNetSelectMusic::StartSelectedSong()
GAMESTATE->m_pPreferredSong = pSong;
TweenOffScreen();
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn )
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -630,7 +630,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
{
if(IsTransitioning())
return; /* already transitioning */
StartTransitioning( SM_ExportOptions );
StartTransitioningScreen( SM_ExportOptions );
SCREENMAN->PlayStartSound();
stepmania/src/ScreenRanking.cpp
+3 -3
View File
@@ -147,13 +147,13 @@ void ScreenRanking::Input( const InputEventPlus &input )
void ScreenRanking::MenuStart( PlayerNumber pn )
{
if( !IsTransitioning() )
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
void ScreenRanking::MenuBack( PlayerNumber pn )
{
if( !IsTransitioning() )
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
@@ -172,7 +172,7 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
}
else
{
StartTransitioning(SM_GoToNextScreen);
StartTransitioningScreen(SM_GoToNextScreen);
}
}
else if( SM == SM_HidePage )
stepmania/src/ScreenSelect.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
else if( SM == SM_AllDoneChoosing ) /* It's our turn to tween out. */
{
if( !IsTransitioning() )
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
else if( SM == SM_GoToNextScreen )
{
stepmania/src/ScreenSelectCharacter.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM )
switch( SM )
{
case SM_BeginFadingOut:
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
return;
case SM_MenuTimer:
MenuStart(PLAYER_1);
stepmania/src/ScreenSelectGroup.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
switch( SM )
{
case SM_BeginFadingOut:
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
return;
}
Screen::HandleScreenMessage( SM );
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -1245,12 +1245,12 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
if( OPTIONS_MENU_AVAILABLE )
{
StartTransitioning( SM_None );
StartTransitioningScreen( SM_None );
this->PostScreenMessage( SM_TweenOffOptionsMessage, SHOW_OPTIONS_MESSAGE_SECONDS );
}
else
{
StartTransitioning( SM_BeginFadingOut );
StartTransitioningScreen( SM_BeginFadingOut );
}
}
}
stepmania/src/ScreenSetTime.cpp
+2 -2
View File
@@ -222,7 +222,7 @@ void ScreenSetTime::MenuStart( PlayerNumber pn )
}
SOUND->PlayOnce( THEME->GetPathS("Common","start") );
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
}
else
ChangeSelection( +1 );
@@ -235,7 +235,7 @@ void ScreenSetTime::MenuSelect( PlayerNumber pn )
void ScreenSetTime::MenuBack( PlayerNumber pn )
{
StartTransitioning( SM_GoToPrevScreen );
StartTransitioningScreen( SM_GoToPrevScreen );
}
/*
stepmania/src/ScreenSplash.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ void ScreenSplash::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_BeginFadingOut )
{
StartTransitioning( SM_GoToNextScreen );
StartTransitioningScreen( SM_GoToNextScreen );
return;
}
stepmania/src/ScreenTestInput.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ void ScreenTestInput::MenuBack( PlayerNumber pn )
if(!IsTransitioning())
{
SCREENMAN->PlayStartSound();
StartTransitioning( SM_GoToPrevScreen );
StartTransitioningScreen( SM_GoToPrevScreen );
}
}
stepmania/src/ScreenTestLights.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ void ScreenTestLights::MenuBack( PlayerNumber pn )
{
SCREENMAN->PlayStartSound();
OFF_COMMAND( m_textInputs );
StartTransitioning( SM_GoToPrevScreen );
StartTransitioningScreen( SM_GoToPrevScreen );
}
}
stepmania/src/ScreenWithMenuElements.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ void ScreenWithMenuElements::ResetTimer()
}
}
void ScreenWithMenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
void ScreenWithMenuElements::StartTransitioningScreen( ScreenMessage smSendWhenDone )
{
TweenOffScreen();
stepmania/src/ScreenWithMenuElements.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
virtual ~ScreenWithMenuElements();
void Update( float fDeltaTime );
void StartTransitioning( ScreenMessage smSendWhenDone );
void StartTransitioningScreen( ScreenMessage smSendWhenDone );
virtual void Cancel( ScreenMessage smSendWhenDone );
bool IsTransitioning();