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

[Xcode4] May as well fix switch warnings.

Browse Source 
Still need some assistance for the linker error.
This commit is contained in:
Jason Felds
2011-07-20 11:11:04 -04:00
parent 87c16e9561
commit dbdab4759e
51 changed files with 1159 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameState.cpp
+19 -16
View File
@@ -747,7 +747,9 @@ void GameState::CancelStage()
{
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
m_iPlayerStageTokens[p] = PREFSMAN->m_iSongsPerPlay;
m_iPlayerStageTokens[p] = PREFSMAN->m_iSongsPerPlay;
default:
break;
}
}
@@ -1169,12 +1171,12 @@ bool GameState::IsPlayerEnabled( PlayerNumber pn ) const
// In rave, all players are present. Non-human players are CPU controlled.
switch( m_PlayMode )
{
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
return true;
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
return true;
default:
return IsHumanPlayer(pn);
}
return IsHumanPlayer( pn );
}
bool GameState::IsMultiPlayerEnabled( MultiPlayer mp ) const
@@ -1346,16 +1348,17 @@ StageResult GameState::GetStageResult( PlayerNumber pn ) const
{
switch( m_PlayMode )
{
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
if( fabsf(m_fTugLifePercentP1 - 0.5f) < 0.0001f )
return RESULT_DRAW;
switch( pn )
{
case PLAYER_1: return (m_fTugLifePercentP1>=0.5f)?RESULT_WIN:RESULT_LOSE;
case PLAYER_2: return (m_fTugLifePercentP1<0.5f)?RESULT_WIN:RESULT_LOSE;
default: ASSERT(0); return RESULT_LOSE;
}
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
if( fabsf(m_fTugLifePercentP1 - 0.5f) < 0.0001f )
return RESULT_DRAW;
switch( pn )
{
case PLAYER_1: return (m_fTugLifePercentP1>=0.5f)?RESULT_WIN:RESULT_LOSE;
case PLAYER_2: return (m_fTugLifePercentP1<0.5f)?RESULT_WIN:RESULT_LOSE;
default: FAIL_M("Invalid player for battle! Aborting..."); return RESULT_LOSE;
}
default: break;
}
StageResult win = RESULT_WIN;