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

remove GameState::PlayerUsingBothSides

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-30 02:57:05 +00:00
parent 12ce0f9bf4
commit 5e99a1c9e9
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
-15
View File
@@ -886,19 +886,6 @@ int GameState::GetNumPlayersEnabled() const
return count; 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 bool GameState::IsHumanPlayer( PlayerNumber pn ) const
{ {
if( pn == PLAYER_INVALID ) if( pn == PLAYER_INVALID )
@@ -1956,7 +1943,6 @@ public:
DEFINE_METHOD( GetNumPlayersEnabled, GetNumPlayersEnabled() ) DEFINE_METHOD( GetNumPlayersEnabled, GetNumPlayersEnabled() )
DEFINE_METHOD( GetSongBeat, m_fSongBeat ) DEFINE_METHOD( GetSongBeat, m_fSongBeat )
DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn ) DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn )
DEFINE_METHOD( PlayerUsingBothSides, PlayerUsingBothSides() )
DEFINE_METHOD( GetCoins, m_iCoins ) DEFINE_METHOD( GetCoins, m_iCoins )
DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[Enum::Check<PlayerNumber>(L, 1)] ) DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[Enum::Check<PlayerNumber>(L, 1)] )
DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() ) DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() )
@@ -2103,7 +2089,6 @@ public:
ADD_METHOD( GetNumPlayersEnabled ); ADD_METHOD( GetNumPlayersEnabled );
ADD_METHOD( GetSongBeat ); ADD_METHOD( GetSongBeat );
ADD_METHOD( GetGameplayLeadIn ); ADD_METHOD( GetGameplayLeadIn );
ADD_METHOD( PlayerUsingBothSides );
ADD_METHOD( GetCoins ); ADD_METHOD( GetCoins );
ADD_METHOD( IsSideJoined ); ADD_METHOD( IsSideJoined );
ADD_METHOD( GetCoinsNeededToJoin ); ADD_METHOD( GetCoinsNeededToJoin );
stepmania/src/GameState.h
-1
View File
@@ -89,7 +89,6 @@ public:
bool IsMultiPlayerEnabled( MultiPlayer mp ) const; bool IsMultiPlayerEnabled( MultiPlayer mp ) const;
bool IsPlayerEnabled( const PlayerState* pPlayerState ) const; bool IsPlayerEnabled( const PlayerState* pPlayerState ) const;
int GetNumPlayersEnabled() const; int GetNumPlayersEnabled() const;
bool PlayerUsingBothSides() const;
bool IsHumanPlayer( PlayerNumber pn ) const; bool IsHumanPlayer( PlayerNumber pn ) const;
int GetNumHumanPlayers() const; int GetNumHumanPlayers() const;
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -562,7 +562,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
#if !defined(WITHOUT_NETWORKING) #if !defined(WITHOUT_NETWORKING)
// Only used in SMLAN/SMOnline: // 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(); m_bShowScoreboard = PREFSMAN->m_bEnableScoreboard.Get();
PlayerNumber pn = GAMESTATE->GetFirstDisabledPlayer(); PlayerNumber pn = GAMESTATE->GetFirstDisabledPlayer();