diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 94923152e4..7573c607cc 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -34,8 +34,8 @@ #define ENDGAME_SCREEN GET_THEME_METRIC_FALLBACK("EndGameScreen") #define BANNER_ON_COMMAND( i ) GET_THEME_METRIC_FALLBACK(ssprintf("Banner%dOnCommand",i+1)) #define BANNER_OFF_COMMAND( i ) GET_THEME_METRIC_FALLBACK(ssprintf("Banner%dOffCommand",i+1)) -#define BANNER_WIDTH atof(GET_THEME_METRIC_FALLBACK("BannerWidth")) -#define BANNER_HEIGHT atof(GET_THEME_METRIC_FALLBACK("BannerHeight")) +#define BANNER_WIDTH float(atof(GET_THEME_METRIC_FALLBACK("BannerWidth"))) +#define BANNER_HEIGHT float(atof(GET_THEME_METRIC_FALLBACK("BannerHeight"))) #define STAGE_ON_COMMAND GET_THEME_METRIC_FALLBACK("StageOnCommand") #define STAGE_OFF_COMMAND GET_THEME_METRIC_FALLBACK("StageOffCommand") #define DIFFICULTY_ICON_ON_COMMAND( p ) GET_THEME_METRIC_FALLBACK(ssprintf("DifficultyIconP%dOnCommand",p+1)) @@ -335,8 +335,8 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) stageStats.iPossibleDancePoints[p] = max( 1, stageStats.iPossibleDancePoints[p] ); float fPercentDancePoints = stageStats.iActualDancePoints[p] / (float)stageStats.iPossibleDancePoints[p] + 0.0001f; // correct for rounding errors fPercentDancePoints = max( fPercentDancePoints, 0 ); - int iPercentWhole = int(fPercentDancePoints*100); - int iPercentRemainder = int( (fPercentDancePoints*100 - int(fPercentDancePoints*100)) * 10 ); +// int iPercentWhole = int(fPercentDancePoints*100); +// int iPercentRemainder = int( (fPercentDancePoints*100 - int(fPercentDancePoints*100)) * 10 ); // m_textPercentWhole[p].SetText( ssprintf("%02d", iPercentWhole) ); // m_textPercentRemainder[p].SetText( ssprintf(".%01d%%", iPercentRemainder) ); m_textPercentWhole[p].SetText( "00" ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index b93b7414d3..413e5c294b 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -328,7 +328,7 @@ void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort() apActorsInScore[i]->StopTweening(); float fOriginalX = apActorsInScore[i]->GetX(); - apActorsInScore[i]->BeginTweening( factor*0.5, TWEEN_DECELERATE ); // tween off screen + apActorsInScore[i]->BeginTweening( factor*0.5f, TWEEN_DECELERATE ); // tween off screen apActorsInScore[i]->SetTweenX( fOriginalX+400 ); apActorsInScore[i]->BeginTweening( factor*0.5f ); // sleep @@ -668,7 +668,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) { - float fShowSeconds = m_Menu.m_Out.GetLengthSeconds(); +// float fShowSeconds = m_Menu.m_Out.GetLengthSeconds(); // show "hold START for options" m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); // visible