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
+8 -5
View File
@@ -436,13 +436,16 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
int player;
if( ini.GetValue( sLayer, "Player", player ) )
{
if( player > 0 && player <= NUM_PLAYERS )
PlayerNumber pn = (PlayerNumber)(player-1);
if( pn>=0 && pn<NUM_PLAYERS )
{
if( !GAMESTATE->IsPlayerEnabled(player-1) )
if( !GAMESTATE->IsPlayerEnabled(pn) )
return;
} else
LOG->Warn("BGA \"%s\" %s has an invalid Player field",
sAniDir.c_str(), sLayer.c_str() );
}
else
{
LOG->Warn("BGA \"%s\" %s has an invalid Player field", sAniDir.c_str(), sLayer.c_str() );
}
}
}