Some respect for OOP. (MasterPlayerNumber)

This commit is contained in:
Jason Felds
2011-06-06 20:40:11 -04:00
parent 963cc9d4f1
commit 0a7b9ce170
33 changed files with 106 additions and 94 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ REGISTER_SCREEN_CLASS( ScreenGameplayShared );
void ScreenGameplayShared::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
{
const PlayerNumber master = GAMESTATE->m_MasterPlayerNumber;
const PlayerNumber master = GAMESTATE->GetMasterPlayerNumber();
const PlayerNumber other = (master == PLAYER_1? PLAYER_2:PLAYER_1);
/* The master player is where all of the real work takes place. The other player exists
@@ -23,7 +23,7 @@ void ScreenGameplayShared::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
PlayerInfo &ScreenGameplayShared::GetPlayerInfoForInput( const InputEventPlus& iep )
{
return m_vPlayerInfo[GAMESTATE->m_MasterPlayerNumber];
return m_vPlayerInfo[GAMESTATE->GetMasterPlayerNumber()];
}
/*