From cb746be4c3c057d116dcd9e907ac541458052938 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 7 Oct 2006 03:43:41 +0000 Subject: [PATCH] Invalid --- stepmania/src/CodeDetector.cpp | 2 +- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/GameState.cpp | 2 +- stepmania/src/HoldJudgment.cpp | 6 +++--- stepmania/src/InputEventPlus.h | 2 +- stepmania/src/InputMapper.cpp | 8 ++++---- stepmania/src/InputMapper.h | 4 ++-- stepmania/src/Judgment.cpp | 6 +++--- stepmania/src/Player.cpp | 6 +++--- stepmania/src/PlayerNumber.cpp | 2 +- stepmania/src/PlayerNumber.h | 4 ++-- stepmania/src/PlayerState.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 8 ++++---- stepmania/src/ScreenGameplay.h | 2 +- stepmania/src/ScreenGameplayNormal.cpp | 2 +- stepmania/src/StepMania.cpp | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp index 28fcfc10ba..1afabe8c3e 100644 --- a/stepmania/src/CodeDetector.cpp +++ b/stepmania/src/CodeDetector.cpp @@ -79,7 +79,7 @@ bool CodeItem::EnteredCode( GameController controller ) const for( unsigned i=0; iIsBeingPressed(gi, MultiPlayer_INVALID, &iep.InputList) ) + if( !INPUTMAPPER->IsBeingPressed(gi, MultiPlayer_Invalid, &iep.InputList) ) return false; } return true; diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 9325cf0968..93ac76b4b9 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -35,7 +35,7 @@ void GameCommand::Init() m_sText = ""; m_bInvalid = true; m_iIndex = -1; - m_MultiPlayer = MultiPlayer_INVALID; + m_MultiPlayer = MultiPlayer_Invalid; m_pStyle = NULL; m_pm = PlayMode_Invalid; m_dc = DIFFICULTY_INVALID; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 4ddb5d455e..ac88971d30 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -878,7 +878,7 @@ bool GameState::IsMultiPlayerEnabled( MultiPlayer mp ) const bool GameState::IsPlayerEnabled( const PlayerState* pPlayerState ) const { - if( pPlayerState->m_mp != MultiPlayer_INVALID ) + if( pPlayerState->m_mp != MultiPlayer_Invalid ) return IsMultiPlayerEnabled( pPlayerState->m_mp ); if( pPlayerState->m_PlayerNumber != PLAYER_INVALID ) return IsPlayerEnabled( pPlayerState->m_PlayerNumber ); diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp index 89db15998f..ce6c7fee75 100644 --- a/stepmania/src/HoldJudgment.cpp +++ b/stepmania/src/HoldJudgment.cpp @@ -12,7 +12,7 @@ REGISTER_ACTOR_CLASS( HoldJudgment ) HoldJudgment::HoldJudgment() { - m_mpToTrack = MultiPlayer_INVALID; + m_mpToTrack = MultiPlayer_Invalid; } void HoldJudgment::Load( const RString &sPath ) @@ -76,14 +76,14 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns ) void HoldJudgment::LoadFromMultiPlayer( MultiPlayer mp ) { - ASSERT( m_mpToTrack == MultiPlayer_INVALID ); // assert only load once + ASSERT( m_mpToTrack == MultiPlayer_Invalid ); // assert only load once m_mpToTrack = mp; this->SubscribeToMessage( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) ); } void HoldJudgment::HandleMessage( const RString &sMessage ) { - ASSERT( m_mpToTrack != MultiPlayer_INVALID ); + ASSERT( m_mpToTrack != MultiPlayer_Invalid ); if( sMessage == MessageToString( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) ) ) SetHoldJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].hnsLast ); diff --git a/stepmania/src/InputEventPlus.h b/stepmania/src/InputEventPlus.h index 65b784833f..7f07b529a7 100644 --- a/stepmania/src/InputEventPlus.h +++ b/stepmania/src/InputEventPlus.h @@ -14,7 +14,7 @@ public: type(IET_FIRST_PRESS), MenuI(MenuButton_INVALID), pn(PLAYER_INVALID), - mp(MultiPlayer_INVALID) { } + mp(MultiPlayer_Invalid) { } DeviceInput DeviceI; GameInput GameI; InputEventType type; diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index c020801370..4394fee4a1 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -809,7 +809,7 @@ bool InputMapper::IsBeingPressed( const GameInput &GameI, MultiPlayer mp, const if( GameToDevice( GameI, i, DeviceI ) ) { - if( mp != MultiPlayer_INVALID ) + if( mp != MultiPlayer_Invalid ) DeviceI.device = MultiPlayerToInputDevice(mp); if( INPUTFILTER->IsBeingPressed(DeviceI, pButtonState) ) return true; @@ -859,7 +859,7 @@ float InputMapper::GetSecsHeld( const GameInput &GameI, MultiPlayer mp ) DeviceInput DeviceI; if( GameToDevice( GameI, i, DeviceI ) ) { - if( mp != MultiPlayer_INVALID ) + if( mp != MultiPlayer_Invalid ) DeviceI.device = MultiPlayerToInputDevice(mp); fMaxSecsHeld = max( fMaxSecsHeld, INPUTFILTER->GetSecsHeld(DeviceI) ); } @@ -902,7 +902,7 @@ void InputMapper::ResetKeyRepeat( MenuButton MenuI, PlayerNumber pn ) InputDevice InputMapper::MultiPlayerToInputDevice( MultiPlayer mp ) { - if( mp == MultiPlayer_INVALID ) + if( mp == MultiPlayer_Invalid ) return InputDevice_Invalid; return enum_add2( DEVICE_JOY1, mp ); } @@ -910,7 +910,7 @@ InputDevice InputMapper::MultiPlayerToInputDevice( MultiPlayer mp ) MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id ) { if( id == InputDevice_Invalid ) - return MultiPlayer_INVALID; + return MultiPlayer_Invalid; return enum_add2( MultiPlayer_1, id - DEVICE_JOY1 ); } diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 9dc942374d..c52b8827c7 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -60,10 +60,10 @@ public: void MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ); PlayerNumber ControllerToPlayerNumber( GameController controller ); - float GetSecsHeld( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID ); + float GetSecsHeld( const GameInput &GameI, MultiPlayer mp = MultiPlayer_Invalid ); float GetSecsHeld( MenuButton MenuI, PlayerNumber pn ); - bool IsBeingPressed( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID, const DeviceInputList *pButtonState = NULL ); + bool IsBeingPressed( const GameInput &GameI, MultiPlayer mp = MultiPlayer_Invalid, const DeviceInputList *pButtonState = NULL ); bool IsBeingPressed( MenuButton MenuI, PlayerNumber pn ); void ResetKeyRepeat( const GameInput &GameI ); diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp index 40b149207e..b010ec54c4 100644 --- a/stepmania/src/Judgment.cpp +++ b/stepmania/src/Judgment.cpp @@ -13,7 +13,7 @@ REGISTER_ACTOR_CLASS( Judgment ) Judgment::Judgment() { - m_mpToTrack = MultiPlayer_INVALID; + m_mpToTrack = MultiPlayer_Invalid; } void Judgment::LoadFromNode( const RString& sDir, const XNode* pNode ) @@ -105,14 +105,14 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly ) void Judgment::LoadFromMultiPlayer( MultiPlayer mp ) { - ASSERT( m_mpToTrack == MultiPlayer_INVALID ); // assert only load once + ASSERT( m_mpToTrack == MultiPlayer_Invalid ); // assert only load once m_mpToTrack = mp; this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ); } void Judgment::HandleMessage( const RString &sMessage ) { - if( m_mpToTrack != MultiPlayer_INVALID && sMessage == MessageToString( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ) ) + if( m_mpToTrack != MultiPlayer_Invalid && sMessage == MessageToString( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ) ) SetJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].tnsLast, false ); // FIXME: save and pass early bool? ActorFrame::HandleMessage( sMessage ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 4bfe5532f5..bf316c5cba 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -209,7 +209,7 @@ void Player::Init( if( GAMESTATE->m_bMultiplayer && !m_sprJudgmentFrame.IsLoaded() ) // only load the first time { GameCommand gc; - ASSERT( pPlayerState->m_mp != MultiPlayer_INVALID ); + ASSERT( pPlayerState->m_mp != MultiPlayer_Invalid ); gc.m_MultiPlayer = pPlayerState->m_mp; { @@ -695,7 +695,7 @@ void Player::Update( float fDeltaTime ) if( m_pPlayerStageStats != NULL ) m_pPlayerStageStats->hnsLast = hns; - if( m_pPlayerState->m_mp != MultiPlayer_INVALID ) + if( m_pPlayerState->m_mp != MultiPlayer_Invalid ) MESSAGEMAN->Broadcast( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_pPlayerState->m_mp) ); m_vHoldJudgment[iTrack]->SetHoldJudgment( hns ); @@ -1760,7 +1760,7 @@ void Player::SetJudgment( TapNoteScore tns, bool bEarly ) { if( m_pPlayerStageStats ) m_pPlayerStageStats->tnsLast = tns; - if( m_pPlayerState->m_mp != MultiPlayer_INVALID ) + if( m_pPlayerState->m_mp != MultiPlayer_Invalid ) MESSAGEMAN->Broadcast( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_pPlayerState->m_mp) ); if( m_pJudgment ) diff --git a/stepmania/src/PlayerNumber.cpp b/stepmania/src/PlayerNumber.cpp index 8533e00955..6510fe91f6 100644 --- a/stepmania/src/PlayerNumber.cpp +++ b/stepmania/src/PlayerNumber.cpp @@ -91,7 +91,7 @@ MultiPlayer GetNextEnabledMultiPlayer( MultiPlayer mp ) for( enum_add(mp, 1); mp < NUM_MultiPlayer; enum_add(mp, 1) ) if( GAMESTATE->IsMultiPlayerEnabled(mp) ) return mp; - return MultiPlayer_INVALID; + return MultiPlayer_Invalid; } /* diff --git a/stepmania/src/PlayerNumber.h b/stepmania/src/PlayerNumber.h index 3d58577465..f45e956ae9 100644 --- a/stepmania/src/PlayerNumber.h +++ b/stepmania/src/PlayerNumber.h @@ -70,7 +70,7 @@ enum MultiPlayer MultiPlayer_31, MultiPlayer_32, NUM_MultiPlayer, // leave this at the end - MultiPlayer_INVALID + MultiPlayer_Invalid }; const RString& MultiPlayerToString( MultiPlayer mp ); const RString& MultiPlayerToLocalizedString( MultiPlayer mp ); @@ -78,7 +78,7 @@ LuaDeclareType( MultiPlayer ); #define FOREACH_MultiPlayer( pn ) FOREACH_ENUM2( MultiPlayer, pn ) -#define FOREACH_EnabledMultiPlayer( mp ) for( MultiPlayer mp=GetNextEnabledMultiPlayer((MultiPlayer)-1); mp!=MultiPlayer_INVALID; mp=GetNextEnabledMultiPlayer(mp) ) +#define FOREACH_EnabledMultiPlayer( mp ) for( MultiPlayer mp=GetNextEnabledMultiPlayer((MultiPlayer)-1); mp!=MultiPlayer_Invalid; mp=GetNextEnabledMultiPlayer(mp) ) MultiPlayer GetNextEnabledMultiPlayer( MultiPlayer mp ); diff --git a/stepmania/src/PlayerState.cpp b/stepmania/src/PlayerState.cpp index baa40ba2d3..1d0f620867 100644 --- a/stepmania/src/PlayerState.cpp +++ b/stepmania/src/PlayerState.cpp @@ -6,7 +6,7 @@ PlayerState::PlayerState() { m_PlayerNumber = PLAYER_INVALID; - m_mp = MultiPlayer_INVALID; + m_mp = MultiPlayer_Invalid; Reset(); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index fe4bc30d1a..f6c5a5d594 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -97,7 +97,7 @@ static Preference g_bEasterEggs( "EasterEggs", true ); PlayerInfo::PlayerInfo() { m_pn = PLAYER_INVALID; - m_mp = MultiPlayer_INVALID; + m_mp = MultiPlayer_Invalid; m_bIsDummy = false; m_pLifeMeter = NULL; m_ptextCourseSongNumber = NULL; @@ -243,7 +243,7 @@ bool PlayerInfo::IsEnabled() { if( m_pn != PLAYER_INVALID ) return GAMESTATE->IsPlayerEnabled( m_pn ); - if( m_mp != MultiPlayer_INVALID ) + if( m_mp != MultiPlayer_Invalid ) return GAMESTATE->IsMultiPlayerEnabled( m_mp ); else if( m_bIsDummy ) return true; @@ -286,7 +286,7 @@ GetNextEnabledPlayerNumberInfo( vector::iterator iter, vectorIsEnabled() ) continue; - if( iter->m_mp != MultiPlayer_INVALID ) + if( iter->m_mp != MultiPlayer_Invalid ) continue; return iter; } @@ -2173,7 +2173,7 @@ void ScreenGameplay::Input( const InputEventPlus &input ) if( GAMESTATE->m_bMultiplayer ) { - if( input.mp != MultiPlayer_INVALID && + if( input.mp != MultiPlayer_Invalid && input.type==IET_FIRST_PRESS && iCol != Column_INVALID && GAMESTATE->IsMultiPlayerEnabled(input.mp) ) diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 3fb4329042..bb514ce30f 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -51,7 +51,7 @@ public: PlayerStageStats *GetPlayerStageStats(); PlayerNumber GetStepsAndTrailIndex() { return m_pn == PLAYER_INVALID ? PLAYER_1 : m_pn; } bool IsEnabled(); - bool IsMultiPlayer() const { return m_mp != MultiPlayer_INVALID; } + bool IsMultiPlayer() const { return m_mp != MultiPlayer_Invalid; } RString GetName() const { if( m_bIsDummy ) diff --git a/stepmania/src/ScreenGameplayNormal.cpp b/stepmania/src/ScreenGameplayNormal.cpp index 697952b952..c46d306537 100644 --- a/stepmania/src/ScreenGameplayNormal.cpp +++ b/stepmania/src/ScreenGameplayNormal.cpp @@ -8,7 +8,7 @@ void ScreenGameplayNormal::FillPlayerInfo( vector &vPlayerInfoOut ) { vPlayerInfoOut.resize( NUM_PLAYERS ); FOREACH_PlayerNumber( p ) - vPlayerInfoOut[p].Load( p, MultiPlayer_INVALID, true ); + vPlayerInfoOut[p].Load( p, MultiPlayer_Invalid, true ); }; // lua end diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 64f5dc8bce..96b92d09a3 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1358,7 +1358,7 @@ void HandleInputEvents(float fDeltaTime) INPUTMAPPER->DeviceToGame( input.DeviceI, input.GameI ); - input.mp = MultiPlayer_INVALID; + input.mp = MultiPlayer_Invalid; { // Translate input to the appropriate MultiPlayer. Assume that all