From 5e99a1c9e99d778d460d8c6c4e5defae0bac078c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 30 Sep 2006 02:57:05 +0000 Subject: [PATCH] remove GameState::PlayerUsingBothSides --- stepmania/src/GameState.cpp | 15 --------------- stepmania/src/GameState.h | 1 - stepmania/src/ScreenGameplay.cpp | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index ec14aa6a57..43b78bc746 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -886,19 +886,6 @@ int GameState::GetNumPlayersEnabled() const return count; } -bool GameState::PlayerUsingBothSides() const -{ - ASSERT( GetCurrentStyle() != NULL ); - switch( GetCurrentStyle()->m_StyleType ) - { - case ONE_PLAYER_TWO_SIDES: - case TWO_PLAYERS_SHARED_SIDES: - return true; - default: - return false; - } -} - bool GameState::IsHumanPlayer( PlayerNumber pn ) const { if( pn == PLAYER_INVALID ) @@ -1956,7 +1943,6 @@ public: DEFINE_METHOD( GetNumPlayersEnabled, GetNumPlayersEnabled() ) DEFINE_METHOD( GetSongBeat, m_fSongBeat ) DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn ) - DEFINE_METHOD( PlayerUsingBothSides, PlayerUsingBothSides() ) DEFINE_METHOD( GetCoins, m_iCoins ) DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[Enum::Check(L, 1)] ) DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() ) @@ -2103,7 +2089,6 @@ public: ADD_METHOD( GetNumPlayersEnabled ); ADD_METHOD( GetSongBeat ); ADD_METHOD( GetGameplayLeadIn ); - ADD_METHOD( PlayerUsingBothSides ); ADD_METHOD( GetCoins ); ADD_METHOD( IsSideJoined ); ADD_METHOD( GetCoinsNeededToJoin ); diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 91eb9328da..9299426ec6 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -89,7 +89,6 @@ public: bool IsMultiPlayerEnabled( MultiPlayer mp ) const; bool IsPlayerEnabled( const PlayerState* pPlayerState ) const; int GetNumPlayersEnabled() const; - bool PlayerUsingBothSides() const; bool IsHumanPlayer( PlayerNumber pn ) const; int GetNumHumanPlayers() const; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 7e3fab58c9..c1d94edefd 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -562,7 +562,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground ) #if !defined(WITHOUT_NETWORKING) // Only used in SMLAN/SMOnline: - if( NSMAN->useSMserver && !GAMESTATE->PlayerUsingBothSides() ) + if( NSMAN->useSMserver && GAMESTATE->GetCurrentStyle()->m_StyleType != ONE_PLAYER_TWO_SIDES ) { m_bShowScoreboard = PREFSMAN->m_bEnableScoreboard.Get(); PlayerNumber pn = GAMESTATE->GetFirstDisabledPlayer();