convert ints and casts to use PlayerNumber and macros

This commit is contained in:
Chris Danford
2004-08-30 04:35:14 +00:00
parent 081c1e24b5
commit cf9b4af6cb
9 changed files with 110 additions and 157 deletions
+7 -14
View File
@@ -277,17 +277,13 @@ void ScreenSelectMode::SetCharacters()
GAMESTATE->GetCharacters( apCharactersToUse );
}
}
for(int pn=0; pn<NUM_PLAYERS; pn++)
FOREACH_EnabledPlayer( pn )
{
if(GAMESTATE->IsPlayerEnabled(pn))
if(ENABLE_CHAR_SELECT && m_iCurrentChar[pn] != -1)
{
if(ENABLE_CHAR_SELECT && m_iCurrentChar[pn] != -1)
{
Character* pChar = apCharactersToUse[m_iCurrentChar[pn]];
GAMESTATE->m_pCurCharacters[pn] = pChar;
}
Character* pChar = apCharactersToUse[m_iCurrentChar[pn]];
GAMESTATE->m_pCurCharacters[pn] = pChar;
}
}
}
@@ -345,14 +341,11 @@ void ScreenSelectMode::Update( float fDelta )
void ScreenSelectMode::DrawPrimitives()
{
ScreenSelect::DrawPrimitives();
for(int pn=0; pn<NUM_PLAYERS; pn++)
FOREACH_EnabledPlayer( pn )
{
if(GAMESTATE->IsPlayerEnabled(pn))
if(ENABLE_CHAR_SELECT)
{
if(ENABLE_CHAR_SELECT)
{
m_CurChar[pn].Draw();
}
m_CurChar[pn].Draw();
}
}
}