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 05:38:13 +00:00
parent 498b049c19
commit 58178ad258
5 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+2 -3
View File
@@ -545,8 +545,6 @@ int g_iLastInsertAttackTrack = -1;
float g_fLastInsertAttackDurationSeconds = -1;
BackgroundLayer g_CurrentBGChangeLayer = BACKGROUND_LAYER_INVALID;
#define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen")
REGISTER_SCREEN_CLASS( ScreenEdit );
ScreenEdit::ScreenEdit( CString sName ) : ScreenWithMenuElements( sName )
{
@@ -1672,7 +1670,6 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_GoToNextScreen )
{
SCREENMAN->SetNewScreen( PREV_SCREEN );
GAMESTATE->m_bEditing = false;
}
else if( SM == SM_BackFromMainMenu )
@@ -1845,6 +1842,8 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
/* Snap the trailing beat, in case we lose focus while tweening. */
m_fTrailingBeat = GAMESTATE->m_fSongBeat;
}
ScreenWithMenuElements::HandleScreenMessage( SM );
}
void ScreenEdit::OnSnapModeChange()
stepmania/src/ScreenEz2SelectPlayer.cpp
+2 -9
View File
@@ -22,8 +22,6 @@
#define JOIN_MESSAGE_Y( i ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("JoinMessageP%dY",i+1))
#define HELP_TEXT THEME->GetMetric("ScreenEz2SelectPlayer","HelpText")
#define TIMER_SECONDS THEME->GetMetricI("ScreenEz2SelectPlayer","TimerSeconds")
#define NEXT_SCREEN THEME->GetMetric("ScreenEz2SelectPlayer","NextScreen")
#define PREV_SCREEN THEME->GetMetric("ScreenEz2SelectPlayer","PrevScreen")
#define SILENT_WAIT THEME->GetMetricB("ScreenEz2SelectPlayer","SilentWait")
#define BOUNCE_JOIN_MESSAGE THEME->GetMetricB("ScreenEz2SelectPlayer","BounceJoinMessage")
#define FOLD_ON_JOIN THEME->GetMetricB("ScreenEz2SelectPlayer","FoldOnJoin")
@@ -143,14 +141,9 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
TweenOffScreen();
StartTransitioning( SM_GoToNextScreen );
break;
case SM_GoToPrevScreen:
SOUND->StopMusic();
SCREENMAN->SetNewScreen( PREV_SCREEN );
break;
case SM_GoToNextScreen:
SCREENMAN->SetNewScreen( NEXT_SCREEN );
break;
}
ScreenWithMenuElements::HandleScreenMessage( SM );
}
stepmania/src/ScreenMapControllers.cpp
-11
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "ScreenMapControllers.h"
#include "PrefsManager.h"
#include "ScreenManager.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "RageLog.h"
@@ -322,16 +321,6 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
Refresh();
}
void ScreenMapControllers::HandleScreenMessage( const ScreenMessage SM )
{
switch( SM )
{
case SM_GoToNextScreen:
SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
break;
}
}
void ScreenMapControllers::Refresh()
{
for( int p=0; p<MAX_GAME_CONTROLLERS; p++ )
stepmania/src/ScreenMapControllers.h
-1
View File
@@ -19,7 +19,6 @@ public:
virtual void Update( float fDeltaTime );
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM );
private:
void KeyLeft();
stepmania/src/ScreenNameEntry.cpp
+2 -4
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "ScreenNameEntry.h"
#include "SongManager.h"
#include "ScreenManager.h"
#include "GameConstantsAndTypes.h"
#include "RageUtil.h"
#include "PrefsManager.h"
@@ -42,7 +41,6 @@
#define FAKE_BEATS_PER_SEC THEME->GetMetricF("ScreenNameEntry","FakeBeatsPerSec")
#define TIMER_SECONDS THEME->GetMetricF("ScreenNameEntry","TimerSeconds")
#define MAX_RANKING_NAME_LENGTH THEME->GetMetricI(m_sName,"MaxRankingNameLength")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
#define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str()))
@@ -395,11 +393,11 @@ void ScreenNameEntry::HandleScreenMessage( const ScreenMessage SM )
// SCREENMAN->SetNewScreen( "ScreenSelectCourse" );
// break;
// }
SCREENMAN->SetNewScreen( NEXT_SCREEN );
}
break;
}
Screen::HandleScreenMessage( SM );
}