diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 3d22d0cb51..4085af2f1b 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -90,7 +90,7 @@ AutoScreenMessage( SM_StopHereWeGo ) static Preference g_fNetStartOffset( "NetworkStartOffset", -3.0 ); -ScreenGameplay::PlayerInfo::PlayerInfo() +PlayerInfo::PlayerInfo() { m_pn = PLAYER_INVALID; m_mp = MultiPlayer_INVALID; @@ -111,7 +111,7 @@ ScreenGameplay::PlayerInfo::PlayerInfo() m_pDifficultyMeter = NULL; } -void ScreenGameplay::PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ) +void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ) { m_pn = pn; m_mp = mp; @@ -190,7 +190,7 @@ void ScreenGameplay::PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bSh } } -void ScreenGameplay::PlayerInfo::LoadDummyP1() +void PlayerInfo::LoadDummyP1() { m_pn = PLAYER_1; m_bIsDummy = true; @@ -202,7 +202,7 @@ void ScreenGameplay::PlayerInfo::LoadDummyP1() m_PlayerStateDummy.m_PlayerController = PC_AUTOPLAY; } -ScreenGameplay::PlayerInfo::~PlayerInfo() +PlayerInfo::~PlayerInfo() { SAFE_DELETE( m_pLifeMeter ); SAFE_DELETE( m_ptextCourseSongNumber ); @@ -220,12 +220,12 @@ ScreenGameplay::PlayerInfo::~PlayerInfo() SAFE_DELETE( m_pDifficultyMeter ); } -void ScreenGameplay::PlayerInfo::ShowOniGameOver() +void PlayerInfo::ShowOniGameOver() { m_sprOniGameOver->PlayCommand( "Die" ); } -PlayerState *ScreenGameplay::PlayerInfo::GetPlayerState() +PlayerState *PlayerInfo::GetPlayerState() { if( m_bIsDummy ) return &m_PlayerStateDummy; @@ -234,7 +234,7 @@ PlayerState *ScreenGameplay::PlayerInfo::GetPlayerState() GAMESTATE->m_pPlayerState[ GetPlayerStateAndStageStatsIndex() ]; } -PlayerStageStats *ScreenGameplay::PlayerInfo::GetPlayerStageStats() +PlayerStageStats *PlayerInfo::GetPlayerStageStats() { if( m_bIsDummy ) return &m_PlayerStageStatsDummy; @@ -243,7 +243,7 @@ PlayerStageStats *ScreenGameplay::PlayerInfo::GetPlayerStageStats() &STATSMAN->m_CurStageStats.m_player[ GetPlayerStateAndStageStatsIndex() ]; } -bool ScreenGameplay::PlayerInfo::IsEnabled() +bool PlayerInfo::IsEnabled() { if( m_pn != PLAYER_INVALID ) return GAMESTATE->IsPlayerEnabled( m_pn ); @@ -255,8 +255,8 @@ bool ScreenGameplay::PlayerInfo::IsEnabled() return false; } -vector::iterator -GetNextEnabledPlayerInfo( vector::iterator iter, vector &v ) +vector::iterator +GetNextEnabledPlayerInfo( vector::iterator iter, vector &v ) { iter++; for( ; iter != v.end(); iter++ ) @@ -268,8 +268,8 @@ GetNextEnabledPlayerInfo( vector::iterator iter, vec return iter; } -vector::iterator -GetNextEnabledPlayerInfoNotDummy( vector::iterator iter, vector &v ) +vector::iterator +GetNextEnabledPlayerInfoNotDummy( vector::iterator iter, vector &v ) { iter++; for( ; iter != v.end(); iter++ ) @@ -283,8 +283,8 @@ GetNextEnabledPlayerInfoNotDummy( vector::iterator i return iter; } -vector::iterator -GetNextEnabledPlayerNumberInfo( vector::iterator iter, vector &v ) +vector::iterator +GetNextEnabledPlayerNumberInfo( vector::iterator iter, vector &v ) { iter++; for( ; iter != v.end(); iter++ ) @@ -300,8 +300,8 @@ GetNextEnabledPlayerNumberInfo( vector::iterator ite return iter; } -vector::iterator -GetNextPlayerNumberInfo( vector::iterator iter, vector &v ) +vector::iterator +GetNextPlayerNumberInfo( vector::iterator iter, vector &v ) { iter++; for( ; iter != v.end(); iter++ ) @@ -315,8 +315,8 @@ GetNextPlayerNumberInfo( vector::iterator iter, vect return iter; } -vector::iterator -GetNextVisiblePlayerInfo( vector::iterator iter, vector &v ) +vector::iterator +GetNextVisiblePlayerInfo( vector::iterator iter, vector &v ) { iter++; for( ; iter != v.end(); iter++ ) diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 30ca80dcf6..86c36f1b81 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -34,6 +34,65 @@ class ScoreKeeper; AutoScreenMessage( SM_NotesEnded ) +class PlayerInfo +{ +public: + PlayerInfo(); + ~PlayerInfo(); + + void Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ); + void LoadDummyP1(); + + void ShowOniGameOver(); + MultiPlayer GetPlayerStateAndStageStatsIndex() { return m_pn == PLAYER_INVALID ? m_mp : (MultiPlayer)m_pn; } + PlayerState *GetPlayerState(); + PlayerStageStats *GetPlayerStageStats(); + PlayerNumber GetStepsAndTrailIndex() { return m_pn == PLAYER_INVALID ? PLAYER_1 : m_pn; } + bool IsEnabled(); + bool IsMultiPlayer() { return m_mp != MultiPlayer_INVALID; } + CString GetName() + { + if( m_bIsDummy ) + return "Dummy"; + if( IsMultiPlayer() ) + return MultiPlayerToString( m_mp ); + else + return PlayerNumberToString( m_pn ); + } + + PlayerNumber m_pn; + MultiPlayer m_mp; + bool m_bIsDummy; + PlayerState m_PlayerStateDummy; + PlayerStageStats m_PlayerStageStatsDummy; + + vector m_vpStepsQueue; // size may be >1 if playing a course + vector m_asModifiersQueue;// size may be >1 if playing a course + + LifeMeter *m_pLifeMeter; + BitmapText *m_ptextCourseSongNumber; + BitmapText *m_ptextStepsDescription; + + ScoreDisplay *m_pPrimaryScoreDisplay; + ScoreDisplay *m_pSecondaryScoreDisplay; + ScoreKeeper *m_pPrimaryScoreKeeper; + ScoreKeeper *m_pSecondaryScoreKeeper; + BitmapText *m_ptextPlayerOptions; + ActiveAttackList *m_pActiveAttackList; + + Transition *m_pWin; + + Player *m_pPlayer; + + // used in PLAY_MODE_BATTLE + Inventory *m_pInventory; + + DifficultyIcon *m_pDifficultyIcon; + DifficultyMeter *m_pDifficultyMeter; + + AutoActor m_sprOniGameOver; +}; + class ScreenGameplay : public ScreenWithMenuElements { public: @@ -159,73 +218,15 @@ protected: NoteData m_CabinetLightsNoteData; - class PlayerInfo - { - public: - PlayerInfo(); - ~PlayerInfo(); - - void Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ); - void LoadDummyP1(); - - void ShowOniGameOver(); - MultiPlayer GetPlayerStateAndStageStatsIndex() { return m_pn == PLAYER_INVALID ? m_mp : (MultiPlayer)m_pn; } - PlayerState *GetPlayerState(); - PlayerStageStats *GetPlayerStageStats(); - PlayerNumber GetStepsAndTrailIndex() { return m_pn == PLAYER_INVALID ? PLAYER_1 : m_pn; } - bool IsEnabled(); - bool IsMultiPlayer() { return m_mp != MultiPlayer_INVALID; } - CString GetName() - { - if( m_bIsDummy ) - return "Dummy"; - if( IsMultiPlayer() ) - return MultiPlayerToString( m_mp ); - else - return PlayerNumberToString( m_pn ); - } - - PlayerNumber m_pn; - MultiPlayer m_mp; - bool m_bIsDummy; - PlayerState m_PlayerStateDummy; - PlayerStageStats m_PlayerStageStatsDummy; - - vector m_vpStepsQueue; // size may be >1 if playing a course - vector m_asModifiersQueue;// size may be >1 if playing a course - - LifeMeter *m_pLifeMeter; - BitmapText *m_ptextCourseSongNumber; - BitmapText *m_ptextStepsDescription; - - ScoreDisplay *m_pPrimaryScoreDisplay; - ScoreDisplay *m_pSecondaryScoreDisplay; - ScoreKeeper *m_pPrimaryScoreKeeper; - ScoreKeeper *m_pSecondaryScoreKeeper; - BitmapText *m_ptextPlayerOptions; - ActiveAttackList *m_pActiveAttackList; - - Transition *m_pWin; - - Player *m_pPlayer; - - // used in PLAY_MODE_BATTLE - Inventory *m_pInventory; - - DifficultyIcon *m_pDifficultyIcon; - DifficultyMeter *m_pDifficultyMeter; - - AutoActor m_sprOniGameOver; - }; vector m_vPlayerInfo; // filled by SGameplay derivatives in Init virtual void FillPlayerInfo( vector &vPlayerInfoOut ) = 0; }; -vector::iterator GetNextEnabledPlayerInfo ( vector::iterator iter, vector &v ); -vector::iterator GetNextEnabledPlayerInfoNotDummy ( vector::iterator iter, vector &v ); -vector::iterator GetNextEnabledPlayerNumberInfo ( vector::iterator iter, vector &v ); -vector::iterator GetNextPlayerNumberInfo ( vector::iterator iter, vector &v ); -vector::iterator GetNextVisiblePlayerInfo ( vector::iterator iter, vector &v ); +vector::iterator GetNextEnabledPlayerInfo ( vector::iterator iter, vector &v ); +vector::iterator GetNextEnabledPlayerInfoNotDummy ( vector::iterator iter, vector &v ); +vector::iterator GetNextEnabledPlayerNumberInfo ( vector::iterator iter, vector &v ); +vector::iterator GetNextPlayerNumberInfo ( vector::iterator iter, vector &v ); +vector::iterator GetNextVisiblePlayerInfo ( vector::iterator iter, vector &v ); #define FOREACH_EnabledPlayerInfo( v, pi ) for( vector::iterator pi = GetNextEnabledPlayerInfo (v.begin()-1,v); pi != v.end(); pi = GetNextEnabledPlayerInfo(pi,v) ) #define FOREACH_EnabledPlayerInfoNotDummy( v, pi ) for( vector::iterator pi = GetNextEnabledPlayerInfoNotDummy (v.begin()-1,v); pi != v.end(); pi = GetNextEnabledPlayerInfoNotDummy(pi,v) ) diff --git a/stepmania/src/ScreenGameplayMultiplayer.h b/stepmania/src/ScreenGameplayMultiplayer.h index b6e1349528..172cfc726d 100644 --- a/stepmania/src/ScreenGameplayMultiplayer.h +++ b/stepmania/src/ScreenGameplayMultiplayer.h @@ -11,7 +11,7 @@ class ScreenGameplayMultiplayer : public ScreenGameplay public: ScreenGameplayMultiplayer( CString sName ); void Init(); - virtual void FillPlayerInfo( vector &vPlayerInfoOut ); + virtual void FillPlayerInfo( vector &vPlayerInfoOut ); }; diff --git a/stepmania/src/ScreenGameplayNormal.h b/stepmania/src/ScreenGameplayNormal.h index a9bc3116fc..ad871389d5 100644 --- a/stepmania/src/ScreenGameplayNormal.h +++ b/stepmania/src/ScreenGameplayNormal.h @@ -10,7 +10,7 @@ class ScreenGameplayNormal : public ScreenGameplay { public: ScreenGameplayNormal( CString sName ); - virtual void FillPlayerInfo( vector &vPlayerInfoOut ); + virtual void FillPlayerInfo( vector &vPlayerInfoOut ); };