Allow combined player steps to have per-player radar values. This doesn't work for trails where it just uses the PLAYER_1 values, same with writing to the catalog file.

2006-07-28 03:34:14 +00:00
parent 1b1f2a9790
commit 884af552ee
16 changed files with 70 additions and 55 deletions
@@ -1129,17 +1129,9 @@ bool GameState::IsDisqualified( PlayerNumber pn )
 	// Check the stored player options for disqualify.  Don't disqualify because
 	// of mods that were forced.
 	if( GAMESTATE->IsCourseMode() )
-	{
-		return po.IsEasierForCourseAndTrail( 
-			GAMESTATE->m_pCurCourse, 
-			GAMESTATE->m_pCurTrail[pn] );
-	}
+		return po.IsEasierForCourseAndTrail(  GAMESTATE->m_pCurCourse, GAMESTATE->m_pCurTrail[pn] );
 	else
-	{
-		return po.IsEasierForSongAndSteps( 
-			GAMESTATE->m_pCurSong, 
-			GAMESTATE->m_pCurSteps[pn] );
-	}
+		return po.IsEasierForSongAndSteps(  GAMESTATE->m_pCurSong, GAMESTATE->m_pCurSteps[pn], pn);
 }

 void GameState::GetAllUsedNoteSkins( vector<RString> &out ) const