From 4529d61eeff81cea436289e064ff2527e104e0d9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 31 Mar 2003 18:29:25 +0000 Subject: [PATCH] fix GradeDisplay --- stepmania/src/GradeDisplay.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp index b65e5f7ddf..9e236af083 100644 --- a/stepmania/src/GradeDisplay.cpp +++ b/stepmania/src/GradeDisplay.cpp @@ -38,7 +38,7 @@ bool GradeDisplay::Load( RageTextureID ID ) Sprite::Load( ID ); Sprite::StopAnimating(); - if( Sprite::GetNumStates() != 8 || Sprite::GetNumStates() != 16 ) + if( Sprite::GetNumStates() != 8 && Sprite::GetNumStates() != 16 ) RageException::Throw( "The grade graphic '%s' must have either 8 or 16 frames.", ID.filename.GetString() ); return true; } @@ -107,8 +107,12 @@ void GradeDisplay::SetGrade( PlayerNumber pn, Grade g ) m_bDoScrolling = false; StopUsingCustomCoords(); - SetState( GetFrameNo(pn,g) ); - Sprite::SetDiffuse( RageColor(1,1,1,g==GRADE_NO_DATA ? 0 : 1) ); + if(g != GRADE_NO_DATA) + { + SetState( GetFrameNo(pn,g) ); + SetDiffuse( RageColor(1,1,1,1.0f) ); + } else + SetDiffuse( RageColor(1,1,1,0) ); } void GradeDisplay::Spin()