From a429663b7c2609c9b5511aa9e0cb161e32a33b6c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 10 Sep 2002 17:29:11 +0000 Subject: [PATCH] renamed "top frame" to "life frame", and "bottom frame" to "score frame", fixed crash in eval after oni --- stepmania/Themes/default/metrics.ini | 16 +++--- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 84 ++++++++++++++-------------- stepmania/src/ScreenGameplay.h | 4 +- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 4a35edfd2d..8b19d9d33b 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -265,12 +265,12 @@ TimerSeconds=60 StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2 [ScreenGameplay] -TopFrameX=320 -TopFrameY=36 -TopFrameExtraY=442 -BottomFrameX=320 -BottomFrameY=448 -BottomFrameExtraY=32 +LifeFrameX=320 +LifeFrameY=36 +LifeFrameExtraY=442 +ScoreFrameX=320 +ScoreFrameY=448 +ScoreFrameExtraY=32 MiddleFrameX=320 MiddleFrameY=240 LifeP1X=140 @@ -541,9 +541,9 @@ ExtraColor=1.0,0.0,0.0,1.0 // red [Background] LeftEdge=20 -TopEdge=40 +TopEdge=20 RightEdge=620 -BottomEdge=424 +BottomEdge=460 [Player] JudgePerfectZoomX=1.3 diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 8bd5eca6dc..8e8e905491 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -391,7 +391,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) fPercentDancePoints = max( fPercentDancePoints, 0 ); int iPercentDancePointsLarge = int(fPercentDancePoints*100); int iPercentDancePointsSmall = int( (fPercentDancePoints*100 - int(fPercentDancePoints*100)) * 10 ); - m_textOniPercentLarge[p].SetText( ssprintf("%02d%", iPercentDancePointsLarge) ); + m_textOniPercentLarge[p].SetText( ssprintf("%02d", iPercentDancePointsLarge) ); m_textOniPercentSmall[p].SetText( ssprintf(".%01d%%", iPercentDancePointsSmall) ); // StageInfo stuff diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index e67be9e1aa..0c398bff20 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -32,10 +32,10 @@ // Defines // -#define TOP_FRAME_X THEME->GetMetricF("ScreenGameplay","TopFrameX") -#define TOP_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("TopFrame%sY",e?"Extra":"")) -#define BOTTOM_FRAME_X THEME->GetMetricF("ScreenGameplay","BottomFrameX") -#define BOTTOM_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("BottomFrame%sY",e?"Extra":"")) +#define LIFE_FRAME_X THEME->GetMetricF("ScreenGameplay","LifeFrameX") +#define LIFE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeFrame%sY",e?"Extra":"")) +#define SCORE_FRAME_X THEME->GetMetricF("ScreenGameplay","ScoreFrameX") +#define SCORE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("ScoreFrame%sY",e?"Extra":"")) #define MIDDLE_FRAME_X THEME->GetMetricF("ScreenGameplay","MiddleFrameX") #define MIDDLE_FRAME_Y THEME->GetMetricF("ScreenGameplay","MiddleFrameY") #define LIFE_X( p ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeP%dX",p+1)) @@ -201,17 +201,17 @@ ScreenGameplay::ScreenGameplay() this->AddChild( m_pLifeMeter[p] ); } - // TopFrame goes above LifeMeter - CString sTopFrameName; + // LifeFrame goes above LifeMeter + CString sLifeFrameName; if( bExtra ) - sTopFrameName = "gameplay extra top frame"; + sLifeFrameName = "gameplay extra life frame"; else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) - sTopFrameName = "gameplay oni top frame"; + sLifeFrameName = "gameplay oni life frame"; else - sTopFrameName = "gameplay top frame"; - m_sprTopFrame.Load( THEME->GetPathTo("Graphics",sTopFrameName) ); - m_sprTopFrame.SetXY( TOP_FRAME_X, TOP_FRAME_Y(bExtra) ); - this->AddChild( &m_sprTopFrame ); + sLifeFrameName = "gameplay life frame"; + m_sprLifeFrame.Load( THEME->GetPathTo("Graphics",sLifeFrameName) ); + m_sprLifeFrame.SetXY( LIFE_FRAME_X, LIFE_FRAME_Y(bExtra) ); + this->AddChild( &m_sprLifeFrame ); m_textStageNumber.LoadFromFont( THEME->GetPathTo("Fonts","gameplay stage") ); @@ -246,18 +246,18 @@ ScreenGameplay::ScreenGameplay() // - // Add all Actors in bottom frame + // Add all Actors in score frame // - CString sBottomFrameName; + CString sScoreFrameName; if( bExtra ) - sBottomFrameName = "gameplay extra bottom frame"; + sScoreFrameName = "gameplay extra score frame"; else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) - sBottomFrameName = "gameplay oni bottom frame"; + sScoreFrameName = "gameplay oni score frame"; else - sBottomFrameName = "gameplay bottom frame"; - m_sprBottomFrame.Load( THEME->GetPathTo("Graphics",sBottomFrameName) ); - m_sprBottomFrame.SetXY( BOTTOM_FRAME_X, BOTTOM_FRAME_Y(bExtra) ); - this->AddChild( &m_sprBottomFrame ); + sScoreFrameName = "gameplay score frame"; + m_sprScoreFrame.Load( THEME->GetPathTo("Graphics",sScoreFrameName) ); + m_sprScoreFrame.SetXY( SCORE_FRAME_X, SCORE_FRAME_Y(bExtra) ); + this->AddChild( &m_sprScoreFrame ); for( p=0; p apActorsInTopFrame; - apActorsInTopFrame.Add( &m_sprTopFrame ); + CArray apActorsInLifeFrame; + apActorsInLifeFrame.Add( &m_sprLifeFrame ); for( p=0; pGetY(); - apActorsInTopFrame[i]->SetY( fOriginalY-100 ); + float fOriginalY = apActorsInLifeFrame[i]->GetY(); + apActorsInLifeFrame[i]->SetY( fOriginalY-100 ); if( !GAMESTATE->m_bDemonstration ) - apActorsInTopFrame[i]->BeginTweening( 0.5f ); // sleep - apActorsInTopFrame[i]->BeginTweening( 1 ); - apActorsInTopFrame[i]->SetTweenY( fOriginalY ); + apActorsInLifeFrame[i]->BeginTweening( 0.5f ); // sleep + apActorsInLifeFrame[i]->BeginTweening( 1 ); + apActorsInLifeFrame[i]->SetTweenY( fOriginalY ); } - CArray apActorsInBottomFrame; - apActorsInBottomFrame.Add( &m_sprBottomFrame ); + CArray apActorsInScoreFrame; + apActorsInScoreFrame.Add( &m_sprScoreFrame ); for( p=0; pIsPlayerEnabled(p) ) continue; - apActorsInBottomFrame.Add( m_pScoreDisplay[p] ); - apActorsInBottomFrame.Add( &m_textPlayerOptions[p] ); + apActorsInScoreFrame.Add( m_pScoreDisplay[p] ); + apActorsInScoreFrame.Add( &m_textPlayerOptions[p] ); } - apActorsInBottomFrame.Add( &m_textSongOptions ); - for( i=0; iGetY(); - apActorsInBottomFrame[i]->SetY( fOriginalY+100 ); + float fOriginalY = apActorsInScoreFrame[i]->GetY(); + apActorsInScoreFrame[i]->SetY( fOriginalY+100 ); if( !GAMESTATE->m_bDemonstration ) - apActorsInBottomFrame[i]->BeginTweening( 0.5f ); // sleep - apActorsInBottomFrame[i]->BeginTweening( 1 ); - apActorsInBottomFrame[i]->SetTweenY( fOriginalY ); + apActorsInScoreFrame[i]->BeginTweening( 0.5f ); // sleep + apActorsInScoreFrame[i]->BeginTweening( 1 ); + apActorsInScoreFrame[i]->SetTweenY( fOriginalY ); } for( p=0; p