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

Fix for gcc 4.1.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-30 22:12:21 +00:00
parent 90ab350854
commit 7a228c26a8
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PlayerNumber.cpp
+15 -25
View File
@@ -64,51 +64,41 @@ LuaFunction( MultiPlayerToLocalizedString, MultiPlayerToLocalizedString((MultiPl
PlayerNumber GetNextHumanPlayer( PlayerNumber pn ) PlayerNumber GetNextHumanPlayer( PlayerNumber pn )
{ {
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ ) for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
{ if( GAMESTATE->IsHumanPlayer(pn) )
if( GAMESTATE->IsHumanPlayer(p) ) return pn;
return p;
}
return PLAYER_INVALID; return PLAYER_INVALID;
} }
PlayerNumber GetNextEnabledPlayer( PlayerNumber pn ) PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
{ {
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ ) for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
{ if( GAMESTATE->IsPlayerEnabled(pn) )
if( GAMESTATE->IsPlayerEnabled(p) ) return pn;
return p;
}
return PLAYER_INVALID; return PLAYER_INVALID;
} }
PlayerNumber GetNextCpuPlayer( PlayerNumber pn ) PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
{ {
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ ) for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
{ if( GAMESTATE->IsCpuPlayer(pn) )
if( GAMESTATE->IsCpuPlayer(p) ) return pn;
return p;
}
return PLAYER_INVALID; return PLAYER_INVALID;
} }
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn ) PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
{ {
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ ) for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
{ if( !GAMESTATE->IsHumanPlayer(pn) )
if( !GAMESTATE->IsHumanPlayer(p) ) return pn;
return p;
}
return PLAYER_INVALID; return PLAYER_INVALID;
} }
MultiPlayer GetNextEnabledMultiPlayer( MultiPlayer mp ) MultiPlayer GetNextEnabledMultiPlayer( MultiPlayer mp )
{ {
for( MultiPlayer p=(MultiPlayer)(mp+1); p<NUM_MultiPlayer; ((int&)p)++ ) for( enum_add(mp, 1); mp < NUM_MultiPlayer; enum_add(mp, 1) )
{ if( GAMESTATE->IsMultiPlayerEnabled(mp) )
if( GAMESTATE->IsMultiPlayerEnabled(p) ) return mp;
return p;
}
return MultiPlayer_INVALID; return MultiPlayer_INVALID;
} }