fix compile error
This commit is contained in:
@@ -54,6 +54,16 @@ PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
|
|||||||
return PLAYER_INVALID;
|
return PLAYER_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
|
||||||
|
{
|
||||||
|
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
|
||||||
|
{
|
||||||
|
if( GAMESTATE->IsCpuPlayer(p) )
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
return PLAYER_INVALID;
|
||||||
|
}
|
||||||
|
|
||||||
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
|
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
|
||||||
{
|
{
|
||||||
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
|
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
|
||||||
|
|||||||
@@ -29,10 +29,12 @@ enum PlayerNumber {
|
|||||||
#define FOREACH_PlayerNumber( pn ) FOREACH_ENUM( PlayerNumber, NUM_PLAYERS, pn )
|
#define FOREACH_PlayerNumber( pn ) FOREACH_ENUM( PlayerNumber, NUM_PLAYERS, pn )
|
||||||
#define FOREACH_HumanPlayer( pn ) for( PlayerNumber pn=GetNextHumanPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextHumanPlayer(pn) )
|
#define FOREACH_HumanPlayer( pn ) for( PlayerNumber pn=GetNextHumanPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextHumanPlayer(pn) )
|
||||||
#define FOREACH_EnabledPlayer( pn ) for( PlayerNumber pn=GetNextEnabledPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextEnabledPlayer(pn) )
|
#define FOREACH_EnabledPlayer( pn ) for( PlayerNumber pn=GetNextEnabledPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextEnabledPlayer(pn) )
|
||||||
|
#define FOREACH_CpuPlayer( pn ) for( PlayerNumber pn=GetNextCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextCpuPlayer(pn) )
|
||||||
#define FOREACH_PotentialCpuPlayer( pn ) for( PlayerNumber pn=GetNextPotentialCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextPotentialCpuPlayer(pn) )
|
#define FOREACH_PotentialCpuPlayer( pn ) for( PlayerNumber pn=GetNextPotentialCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextPotentialCpuPlayer(pn) )
|
||||||
|
|
||||||
PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
|
PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
|
||||||
PlayerNumber GetNextEnabledPlayer( PlayerNumber pn );
|
PlayerNumber GetNextEnabledPlayer( PlayerNumber pn );
|
||||||
|
PlayerNumber GetNextCpuPlayer( PlayerNumber pn );
|
||||||
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn );
|
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn );
|
||||||
|
|
||||||
const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
|
const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ void ScreenGameplay::Init()
|
|||||||
|
|
||||||
|
|
||||||
// fill in difficulty of CPU players with that of the first human player
|
// fill in difficulty of CPU players with that of the first human player
|
||||||
FOREACH_CpuPlayer(p)
|
FOREACH_PotentialCpuPlayer(p)
|
||||||
GAMESTATE->m_pCurNotes[p] = GAMESTATE->m_pCurNotes[ GAMESTATE->GetFirstHumanPlayer() ];
|
GAMESTATE->m_pCurNotes[p] = GAMESTATE->m_pCurNotes[ GAMESTATE->GetFirstHumanPlayer() ];
|
||||||
|
|
||||||
switch( GAMESTATE->m_PlayMode )
|
switch( GAMESTATE->m_PlayMode )
|
||||||
|
|||||||
Reference in New Issue
Block a user