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

fix DefaultCpuModifiers not applied if you start in dance and switch to rave

Browse Source
This commit is contained in:
Chris Danford
2004-05-16 20:58:59 +00:00
parent e1617a3104
commit a20cc8b1f4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+3 -2
View File
@@ -276,9 +276,10 @@ void GameState::PlayersFinalized()
m_pCurSong = pProfile->m_pLastSong;
}
FOREACH_CpuPlayer( pn )
FOREACH_PlayerNumber( pn )
{
ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
if( !IsHumanPlayer(pn) )
ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
}
}
stepmania/src/PlayerNumber.cpp
+2 -2
View File
@@ -54,11 +54,11 @@ PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
return PLAYER_INVALID;
}
PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
{
for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
{
if( GAMESTATE->IsCpuPlayer(p) )
if( !GAMESTATE->IsHumanPlayer(p) )
return p;
}
return PLAYER_INVALID;
stepmania/src/PlayerNumber.h
+2 -2
View File
@@ -29,11 +29,11 @@ enum PlayerNumber {
#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_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) )
PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
PlayerNumber GetNextEnabledPlayer( PlayerNumber pn );
PlayerNumber GetNextCpuPlayer( PlayerNumber pn );
PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn );
const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };