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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-12 06:50:18 +00:00
parent 756c6e15fe
commit 70f2d0e0e5
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplayMultiplayer.cpp
+4 -9
View File
@@ -23,13 +23,6 @@
#include "ActorUtil.h" #include "ActorUtil.h"
#include "PrefsManager.h" #include "PrefsManager.h"
//
// Defines
//
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
// received while STATE_DANCING // received while STATE_DANCING
AutoScreenMessage( SM_NotesEnded ) AutoScreenMessage( SM_NotesEnded )
AutoScreenMessage( SM_Ready ) AutoScreenMessage( SM_Ready )
@@ -611,14 +604,16 @@ void ScreenGameplayMultiplayer::HandleScreenMessage( const ScreenMessage SM )
GAMESTATE->CancelStage(); GAMESTATE->CancelStage();
SCREENMAN->DeletePreparedScreens(); SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN ); SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
} }
else if( SM == SM_GoToStateAfterCleared ) else if( SM == SM_GoToStateAfterCleared )
{ {
StageFinished( false ); StageFinished( false );
SCREENMAN->SetNewScreen( NEXT_SCREEN ); SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
} }
Screen::HandleScreenMessage( SM );
} }
stepmania/src/ScreenReloadSongs.cpp
+2 -4
View File
@@ -2,7 +2,6 @@
#include "ScreenReloadSongs.h" #include "ScreenReloadSongs.h"
#include "SongManager.h" #include "SongManager.h"
#include "UnlockManager.h" #include "UnlockManager.h"
#include "ScreenManager.h"
#include "RageTimer.h" #include "RageTimer.h"
#include "RageLog.h" #include "RageLog.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -10,8 +9,6 @@
#include "arch/LoadingWindow/LoadingWindow.h" #include "arch/LoadingWindow/LoadingWindow.h"
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
static const int DrawFrameRate = 20; static const int DrawFrameRate = 20;
class ScreenReloadSongsLoadingWindow: public LoadingWindow class ScreenReloadSongsLoadingWindow: public LoadingWindow
{ {
@@ -82,7 +79,8 @@ void ScreenReloadSongs::Update( float fDeltaTime )
SONGMAN->Reload( m_LoadingWindow ); SONGMAN->Reload( m_LoadingWindow );
UNLOCKMAN->UpdateCachedPointers(); UNLOCKMAN->UpdateCachedPointers();
SCREENMAN->SetNewScreen( NEXT_SCREEN );
SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
} }
/* /*
stepmania/src/ScreenSMOnlineLogin.cpp
+3 -6
View File
@@ -15,9 +15,6 @@
REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin); REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SMOnlinePack )
AutoScreenMessage( SM_PasswordDone ) AutoScreenMessage( SM_PasswordDone )
@@ -102,7 +99,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
if(!ScreenTextEntry::s_bCancelledLast) if(!ScreenTextEntry::s_bCancelledLast)
SendLogin(ScreenTextEntry::s_sLastAnswer); SendLogin(ScreenTextEntry::s_sLastAnswer);
else else
SCREENMAN->SetNewScreen(PREV_SCREEN); SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
} }
else if( SM == SM_SMOnlinePack ) else if( SM == SM_SMOnlinePack )
{ {
@@ -117,7 +114,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
if( GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer) && m_iPlayer < NUM_PLAYERS ) if( GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer) && m_iPlayer < NUM_PLAYERS )
ScreenTextEntry::Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL ); ScreenTextEntry::Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL );
else else
SCREENMAN->SetNewScreen(NEXT_SCREEN); SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
} }
else else
{ {
@@ -156,7 +153,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
} }
else if( SM == SM_GoToPrevScreen ) else if( SM == SM_GoToPrevScreen )
{ {
SCREENMAN->SetNewScreen(PREV_SCREEN); SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
return; return;
} }