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

TweenOursOnScreen/TweenOursOffScreen

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-14 22:26:09 +00:00
parent 037618529c
commit 50a31993a6
10 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+3 -3
View File
@@ -1084,7 +1084,7 @@ void ScreenEvaluation::CommitScores(
} }
void ScreenEvaluation::TweenOffScreen() void ScreenEvaluation::TweenOursOffScreen()
{ {
// large banner area // large banner area
OFF_COMMAND( m_LargeBanner ); OFF_COMMAND( m_LargeBanner );
@@ -1379,7 +1379,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )
void ScreenEvaluation::EndScreen() void ScreenEvaluation::EndScreen()
{ {
TweenOffScreen(); TweenOursOffScreen();
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
m_Grades[p].SettleImmediately(); m_Grades[p].SettleImmediately();
@@ -1394,7 +1394,7 @@ void ScreenEvaluation::EndScreen()
/* Tween the screen out, but leave the MenuElements where they are. /* Tween the screen out, but leave the MenuElements where they are.
* Play the "swoosh" sound manually (would normally be played by the ME * Play the "swoosh" sound manually (would normally be played by the ME
* tween out). */ * tween out). */
TweenOffScreen(); TweenOursOffScreen();
} }
break; break;
} }
stepmania/src/ScreenEvaluation.h
+1 -2
View File
@@ -38,8 +38,7 @@ public:
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
// virtual void TweenOnScreen(); virtual void TweenOursOffScreen();
virtual void TweenOffScreen();
virtual void MenuLeft( PlayerNumber pn ); virtual void MenuLeft( PlayerNumber pn );
virtual void MenuRight( PlayerNumber pn ); virtual void MenuRight( PlayerNumber pn );
virtual void MenuBack( PlayerNumber pn ); virtual void MenuBack( PlayerNumber pn );
stepmania/src/ScreenEz2SelectPlayer.cpp
+5 -5
View File
@@ -85,7 +85,7 @@ void ScreenEz2SelectPlayer::Init()
SOUND->PlayMusic( THEME->GetPathS("ScreenSelectPlayer","music") ); SOUND->PlayMusic( THEME->GetPathS("ScreenSelectPlayer","music") );
TweenOnScreen(); TweenOursOnScreen();
} }
/************************************ /************************************
@@ -138,7 +138,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
MenuStart(PLAYER_1); MenuStart(PLAYER_1);
} }
TweenOffScreen(); TweenOursOffScreen();
StartTransitioning( SM_GoToNextScreen ); StartTransitioning( SM_GoToNextScreen );
break; break;
} }
@@ -201,7 +201,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
if( bBothSidesJoined ) if( bBothSidesJoined )
{ {
TweenOffScreen(); TweenOursOffScreen();
StartTransitioning( SM_GoToNextScreen ); StartTransitioning( SM_GoToNextScreen );
} }
else else
@@ -213,7 +213,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
} }
} }
void ScreenEz2SelectPlayer::TweenOnScreen() void ScreenEz2SelectPlayer::TweenOursOnScreen()
{ {
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
@@ -233,7 +233,7 @@ void ScreenEz2SelectPlayer::TweenOnScreen()
} }
} }
void ScreenEz2SelectPlayer::TweenOffScreen() void ScreenEz2SelectPlayer::TweenOursOffScreen()
{ {
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
stepmania/src/ScreenEz2SelectPlayer.h
+2 -2
View File
@@ -23,8 +23,8 @@ public:
virtual void MenuStart( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn );
virtual void MenuBack( PlayerNumber pn ); virtual void MenuBack( PlayerNumber pn );
private: private:
void TweenOffScreen(); void TweenOursOffScreen();
void TweenOnScreen(); void TweenOursOnScreen();
Sprite m_sprJoinMessage[NUM_PLAYERS]; Sprite m_sprJoinMessage[NUM_PLAYERS];
Sprite m_sprJoinFrame[NUM_PLAYERS]; Sprite m_sprJoinFrame[NUM_PLAYERS];
stepmania/src/ScreenGameplay.cpp
+5 -5
View File
@@ -657,7 +657,7 @@ void ScreenGameplay::Init()
* positioned before we TweenOnScreen. */ * positioned before we TweenOnScreen. */
LoadNextSong(); LoadNextSong();
TweenOnScreen(); TweenOursOnScreen();
this->SortByDrawOrder(); this->SortByDrawOrder();
@@ -2137,7 +2137,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
return; return;
} }
TweenOffScreen(); TweenOursOffScreen();
// do they deserve an extra stage? // do they deserve an extra stage?
if( GAMESTATE->HasEarnedExtraStage() ) if( GAMESTATE->HasEarnedExtraStage() )
@@ -2287,7 +2287,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
AbortGiveUp( false ); AbortGiveUp( false );
m_pSoundMusic->StopPlaying(); m_pSoundMusic->StopPlaying();
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */ m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
TweenOffScreen(); TweenOursOffScreen();
m_Failed.StartTransitioning( SM_GoToNextScreen ); m_Failed.StartTransitioning( SM_GoToNextScreen );
// show the survive time if extra stage // show the survive time if extra stage
@@ -2326,7 +2326,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
} }
void ScreenGameplay::TweenOnScreen() void ScreenGameplay::TweenOursOnScreen()
{ {
ON_COMMAND( m_sprLifeFrame ); ON_COMMAND( m_sprLifeFrame );
ON_COMMAND( m_sprCourseSongNumber ); ON_COMMAND( m_sprCourseSongNumber );
@@ -2362,7 +2362,7 @@ void ScreenGameplay::TweenOnScreen()
ON_COMMAND( m_Scoreboard[sc] ); ON_COMMAND( m_Scoreboard[sc] );
} }
void ScreenGameplay::TweenOffScreen() void ScreenGameplay::TweenOursOffScreen()
{ {
ScreenWithMenuElements::TweenOffScreen(); ScreenWithMenuElements::TweenOffScreen();
stepmania/src/ScreenGameplay.h
+2 -2
View File
@@ -63,8 +63,8 @@ protected:
ThemeMetric<bool> USE_FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric<bool> USE_FORCED_MODIFIERS_IN_BEGINNER;
ThemeMetric<CString> FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric<CString> FORCED_MODIFIERS_IN_BEGINNER;
void TweenOnScreen(); void TweenOursOnScreen();
void TweenOffScreen(); void TweenOursOffScreen();
bool IsLastSong(); bool IsLastSong();
void SetupSong( int iSongIndex ); void SetupSong( int iSongIndex );
stepmania/src/ScreenGameplayMultiplayer.cpp
+4 -4
View File
@@ -235,10 +235,10 @@ void ScreenGameplayMultiplayer::Init()
/* LoadNextSong first, since that positions some elements which need to be /* LoadNextSong first, since that positions some elements which need to be
* positioned before we TweenOnScreen. */ * positioned before we TweenOursOnScreen. */
LoadNextSong(); LoadNextSong();
TweenOnScreen(); TweenOursOnScreen();
this->SortByDrawOrder(); this->SortByDrawOrder();
@@ -617,7 +617,7 @@ void ScreenGameplayMultiplayer::HandleScreenMessage( const ScreenMessage SM )
} }
void ScreenGameplayMultiplayer::TweenOnScreen() void ScreenGameplayMultiplayer::TweenOursOnScreen()
{ {
FOREACH_MultiPlayer(p) FOREACH_MultiPlayer(p)
{ {
@@ -628,7 +628,7 @@ void ScreenGameplayMultiplayer::TweenOnScreen()
m_In.StartTransitioning( SM_Ready ); m_In.StartTransitioning( SM_Ready );
} }
void ScreenGameplayMultiplayer::TweenOffScreen() void ScreenGameplayMultiplayer::TweenOursOffScreen()
{ {
FOREACH_MultiPlayer(p) FOREACH_MultiPlayer(p)
{ {
stepmania/src/ScreenGameplayMultiplayer.h
+2 -2
View File
@@ -53,8 +53,8 @@ public:
virtual bool UsesBackground() const { return false; } virtual bool UsesBackground() const { return false; }
protected: protected:
void TweenOnScreen(); void TweenOursOnScreen();
void TweenOffScreen(); void TweenOursOffScreen();
bool IsLastSong(); bool IsLastSong();
void SetupSong( MultiPlayer p, int iSongIndex ); void SetupSong( MultiPlayer p, int iSongIndex );
stepmania/src/ScreenSelectMusic.cpp
+4 -4
View File
@@ -318,7 +318,7 @@ void ScreenSelectMusic::Init()
ZERO( m_iSelection ); ZERO( m_iSelection );
AfterMusicChange(); AfterMusicChange();
TweenOnScreen(); TweenOursOnScreen();
this->SortByDrawOrder(); this->SortByDrawOrder();
} }
@@ -431,7 +431,7 @@ void ScreenSelectMusic::SkipCoursePartTweens()
m_CourseContents.FinishTweening(); m_CourseContents.FinishTweening();
} }
void ScreenSelectMusic::TweenOnScreen() void ScreenSelectMusic::TweenOursOnScreen()
{ {
TweenSongPartsOnScreen( true ); TweenSongPartsOnScreen( true );
TweenCoursePartsOnScreen( true ); TweenCoursePartsOnScreen( true );
@@ -481,7 +481,7 @@ void ScreenSelectMusic::TweenOnScreen()
} }
} }
void ScreenSelectMusic::TweenOffScreen() void ScreenSelectMusic::TweenOursOffScreen()
{ {
ScreenWithMenuElements::TweenOffScreen(); ScreenWithMenuElements::TweenOffScreen();
@@ -1215,7 +1215,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
if( m_bMadeChoice ) if( m_bMadeChoice )
{ {
TweenOffScreen(); TweenOursOffScreen();
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
if( OPTIONS_MENU_AVAILABLE ) if( OPTIONS_MENU_AVAILABLE )
stepmania/src/ScreenSelectMusic.h
+2 -2
View File
@@ -46,8 +46,8 @@ public:
virtual void PushSelf( lua_State *L ); virtual void PushSelf( lua_State *L );
protected: protected:
void TweenOnScreen(); void TweenOursOnScreen();
void TweenOffScreen(); void TweenOursOffScreen();
void TweenScoreOnAndOffAfterChangeSort(); void TweenScoreOnAndOffAfterChangeSort();
enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode; enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode;
void SwitchDisplayMode( DisplayMode dm ); void SwitchDisplayMode( DisplayMode dm );