Hell? THIS! IS! SM-SSC!

This commit is contained in:
Jason Felds
2011-02-18 15:20:48 -05:00
+6 -8
View File
@@ -133,9 +133,9 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM )
LOG->Trace( "SMNETCheckpoint" ); LOG->Trace( "SMNETCheckpoint" );
for( int i=0; i<m_iActivePlayers; ++i ) for( int i=0; i<m_iActivePlayers; ++i )
{ {
// Strange occourances because of timing cause these things not to // Strange occurences because of timing cause these things not to
// work right and will sometimes cause a crash. // work right and will sometimes cause a crash. We should make SURE
// We should make SURE we won't crash! // we won't crash!
if ( size_t(i) >= NSMAN->m_EvalPlayerData.size() ) if ( size_t(i) >= NSMAN->m_EvalPlayerData.size() )
break; break;
@@ -152,16 +152,14 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM )
// Yes, hardcoded (I'd like to leave it that way) -CNLohr (in reference to Grade_Tier03) // Yes, hardcoded (I'd like to leave it that way) -CNLohr (in reference to Grade_Tier03)
// Themes can read this differently. The correct solution depends... // Themes can read this differently. The correct solution depends...
// TODO: make this a server-side variable, or just find out // TODO: make this a server-side variable. -aj
// the data from the theme? If we find out from the theme, people
// will be using different themes so it means nothing. -aj
if( NSMAN->m_EvalPlayerData[i].grade < Grade_Tier03 ) if( NSMAN->m_EvalPlayerData[i].grade < Grade_Tier03 )
m_textUsers[i].PlayCommand("Tier02OrBetter"); m_textUsers[i].PlayCommand("Tier02OrBetter");
ON_COMMAND( m_textUsers[i] ); ON_COMMAND( m_textUsers[i] );
LOG->Trace( "SMNETCheckpoint%d", i ); LOG->Trace( "SMNETCheckpoint%d", i );
} }
return; //no need to let ScreenEvaluation get ahold of this. return; // No need to let ScreenEvaluation get a hold of this.
} }
else if( SM == SM_GoToNextScreen ) else if( SM == SM_GoToNextScreen )
{ {
@@ -190,7 +188,7 @@ void ScreenNetEvaluation::UpdateStats()
if( THEME->GetMetricB(m_sName,"ShowScoreArea") ) if( THEME->GetMetricB(m_sName,"ShowScoreArea") )
m_textScore[m_pActivePlayer].SetTargetNumber( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].score ); m_textScore[m_pActivePlayer].SetTargetNumber( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].score );
//Values greater than 6 will cause a crash/* //Values greater than 6 will cause a crash
if( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty < 6 ) if( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty < 6 )
{ {
m_DifficultyIcon[m_pActivePlayer].SetPlayer( m_pActivePlayer ); m_DifficultyIcon[m_pActivePlayer].SetPlayer( m_pActivePlayer );