actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

renamed "top frame" to "life frame", and "bottom frame" to "score frame", fixed crash in eval after oni

Browse Source
This commit is contained in:
Chris Danford
2002-09-10 17:29:11 +00:00
parent 808cf1b502
commit a429663b7c
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+8 -8
View File
@@ -265,12 +265,12 @@ TimerSeconds=60
StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2 StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2
[ScreenGameplay] [ScreenGameplay]
TopFrameX=320 LifeFrameX=320
TopFrameY=36 LifeFrameY=36
TopFrameExtraY=442 LifeFrameExtraY=442
BottomFrameX=320 ScoreFrameX=320
BottomFrameY=448 ScoreFrameY=448
BottomFrameExtraY=32 ScoreFrameExtraY=32
MiddleFrameX=320 MiddleFrameX=320
MiddleFrameY=240 MiddleFrameY=240
LifeP1X=140 LifeP1X=140
@@ -541,9 +541,9 @@ ExtraColor=1.0,0.0,0.0,1.0 // red
[Background] [Background]
LeftEdge=20 LeftEdge=20
TopEdge=40 TopEdge=20
RightEdge=620 RightEdge=620
BottomEdge=424 BottomEdge=460
[Player] [Player]
JudgePerfectZoomX=1.3 JudgePerfectZoomX=1.3
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -391,7 +391,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
fPercentDancePoints = max( fPercentDancePoints, 0 ); fPercentDancePoints = max( fPercentDancePoints, 0 );
int iPercentDancePointsLarge = int(fPercentDancePoints*100); int iPercentDancePointsLarge = int(fPercentDancePoints*100);
int iPercentDancePointsSmall = int( (fPercentDancePoints*100 - int(fPercentDancePoints*100)) * 10 ); 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) ); m_textOniPercentSmall[p].SetText( ssprintf(".%01d%%", iPercentDancePointsSmall) );
// StageInfo stuff // StageInfo stuff
stepmania/src/ScreenGameplay.cpp
+42 -42
View File
@@ -32,10 +32,10 @@
// Defines // Defines
// //
#define TOP_FRAME_X THEME->GetMetricF("ScreenGameplay","TopFrameX") #define LIFE_FRAME_X THEME->GetMetricF("ScreenGameplay","LifeFrameX")
#define TOP_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("TopFrame%sY",e?"Extra":"")) #define LIFE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeFrame%sY",e?"Extra":""))
#define BOTTOM_FRAME_X THEME->GetMetricF("ScreenGameplay","BottomFrameX") #define SCORE_FRAME_X THEME->GetMetricF("ScreenGameplay","ScoreFrameX")
#define BOTTOM_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("BottomFrame%sY",e?"Extra":"")) #define SCORE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("ScoreFrame%sY",e?"Extra":""))
#define MIDDLE_FRAME_X THEME->GetMetricF("ScreenGameplay","MiddleFrameX") #define MIDDLE_FRAME_X THEME->GetMetricF("ScreenGameplay","MiddleFrameX")
#define MIDDLE_FRAME_Y THEME->GetMetricF("ScreenGameplay","MiddleFrameY") #define MIDDLE_FRAME_Y THEME->GetMetricF("ScreenGameplay","MiddleFrameY")
#define LIFE_X( p ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeP%dX",p+1)) #define LIFE_X( p ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeP%dX",p+1))
@@ -201,17 +201,17 @@ ScreenGameplay::ScreenGameplay()
this->AddChild( m_pLifeMeter[p] ); this->AddChild( m_pLifeMeter[p] );
} }
// TopFrame goes above LifeMeter // LifeFrame goes above LifeMeter
CString sTopFrameName; CString sLifeFrameName;
if( bExtra ) if( bExtra )
sTopFrameName = "gameplay extra top frame"; sLifeFrameName = "gameplay extra life frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sTopFrameName = "gameplay oni top frame"; sLifeFrameName = "gameplay oni life frame";
else else
sTopFrameName = "gameplay top frame"; sLifeFrameName = "gameplay life frame";
m_sprTopFrame.Load( THEME->GetPathTo("Graphics",sTopFrameName) ); m_sprLifeFrame.Load( THEME->GetPathTo("Graphics",sLifeFrameName) );
m_sprTopFrame.SetXY( TOP_FRAME_X, TOP_FRAME_Y(bExtra) ); m_sprLifeFrame.SetXY( LIFE_FRAME_X, LIFE_FRAME_Y(bExtra) );
this->AddChild( &m_sprTopFrame ); this->AddChild( &m_sprLifeFrame );
m_textStageNumber.LoadFromFont( THEME->GetPathTo("Fonts","gameplay stage") ); 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 ) if( bExtra )
sBottomFrameName = "gameplay extra bottom frame"; sScoreFrameName = "gameplay extra score frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sBottomFrameName = "gameplay oni bottom frame"; sScoreFrameName = "gameplay oni score frame";
else else
sBottomFrameName = "gameplay bottom frame"; sScoreFrameName = "gameplay score frame";
m_sprBottomFrame.Load( THEME->GetPathTo("Graphics",sBottomFrameName) ); m_sprScoreFrame.Load( THEME->GetPathTo("Graphics",sScoreFrameName) );
m_sprBottomFrame.SetXY( BOTTOM_FRAME_X, BOTTOM_FRAME_Y(bExtra) ); m_sprScoreFrame.SetXY( SCORE_FRAME_X, SCORE_FRAME_Y(bExtra) );
this->AddChild( &m_sprBottomFrame ); this->AddChild( &m_sprScoreFrame );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -1415,42 +1415,42 @@ void ScreenGameplay::TweenOnScreen()
{ {
int i, p; int i, p;
CArray<Actor*,Actor*> apActorsInTopFrame; CArray<Actor*,Actor*> apActorsInLifeFrame;
apActorsInTopFrame.Add( &m_sprTopFrame ); apActorsInLifeFrame.Add( &m_sprLifeFrame );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
apActorsInTopFrame.Add( m_pLifeMeter[p] ); apActorsInLifeFrame.Add( m_pLifeMeter[p] );
apActorsInTopFrame.Add( &m_textStageNumber ); apActorsInLifeFrame.Add( &m_textStageNumber );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
apActorsInTopFrame.Add( &m_textCourseSongNumber[p] ); apActorsInLifeFrame.Add( &m_textCourseSongNumber[p] );
for( i=0; i<apActorsInTopFrame.GetSize(); i++ ) for( i=0; i<apActorsInLifeFrame.GetSize(); i++ )
{ {
float fOriginalY = apActorsInTopFrame[i]->GetY(); float fOriginalY = apActorsInLifeFrame[i]->GetY();
apActorsInTopFrame[i]->SetY( fOriginalY-100 ); apActorsInLifeFrame[i]->SetY( fOriginalY-100 );
if( !GAMESTATE->m_bDemonstration ) if( !GAMESTATE->m_bDemonstration )
apActorsInTopFrame[i]->BeginTweening( 0.5f ); // sleep apActorsInLifeFrame[i]->BeginTweening( 0.5f ); // sleep
apActorsInTopFrame[i]->BeginTweening( 1 ); apActorsInLifeFrame[i]->BeginTweening( 1 );
apActorsInTopFrame[i]->SetTweenY( fOriginalY ); apActorsInLifeFrame[i]->SetTweenY( fOriginalY );
} }
CArray<Actor*,Actor*> apActorsInBottomFrame; CArray<Actor*,Actor*> apActorsInScoreFrame;
apActorsInBottomFrame.Add( &m_sprBottomFrame ); apActorsInScoreFrame.Add( &m_sprScoreFrame );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
continue; continue;
apActorsInBottomFrame.Add( m_pScoreDisplay[p] ); apActorsInScoreFrame.Add( m_pScoreDisplay[p] );
apActorsInBottomFrame.Add( &m_textPlayerOptions[p] ); apActorsInScoreFrame.Add( &m_textPlayerOptions[p] );
} }
apActorsInBottomFrame.Add( &m_textSongOptions ); apActorsInScoreFrame.Add( &m_textSongOptions );
for( i=0; i<apActorsInBottomFrame.GetSize(); i++ ) for( i=0; i<apActorsInScoreFrame.GetSize(); i++ )
{ {
float fOriginalY = apActorsInBottomFrame[i]->GetY(); float fOriginalY = apActorsInScoreFrame[i]->GetY();
apActorsInBottomFrame[i]->SetY( fOriginalY+100 ); apActorsInScoreFrame[i]->SetY( fOriginalY+100 );
if( !GAMESTATE->m_bDemonstration ) if( !GAMESTATE->m_bDemonstration )
apActorsInBottomFrame[i]->BeginTweening( 0.5f ); // sleep apActorsInScoreFrame[i]->BeginTweening( 0.5f ); // sleep
apActorsInBottomFrame[i]->BeginTweening( 1 ); apActorsInScoreFrame[i]->BeginTweening( 1 );
apActorsInBottomFrame[i]->SetTweenY( fOriginalY ); apActorsInScoreFrame[i]->SetTweenY( fOriginalY );
} }
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
stepmania/src/ScreenGameplay.h
+2 -2
View File
@@ -83,14 +83,14 @@ private:
TransitionOniFade m_OniFade; // shows between songs in a course TransitionOniFade m_OniFade; // shows between songs in a course
Sprite m_sprTopFrame; Sprite m_sprLifeFrame;
LifeMeter* m_pLifeMeter[NUM_PLAYERS]; LifeMeter* m_pLifeMeter[NUM_PLAYERS];
BitmapText m_textStageNumber; BitmapText m_textStageNumber;
BitmapText m_textCourseSongNumber[NUM_PLAYERS]; BitmapText m_textCourseSongNumber[NUM_PLAYERS];
Sprite m_sprMiddleFrame; Sprite m_sprMiddleFrame;
Sprite m_sprBottomFrame; Sprite m_sprScoreFrame;
ScoreDisplay* m_pScoreDisplay[NUM_PLAYERS]; ScoreDisplay* m_pScoreDisplay[NUM_PLAYERS];
BitmapText m_textPlayerOptions[NUM_PLAYERS]; BitmapText m_textPlayerOptions[NUM_PLAYERS];
BitmapText m_textSongOptions; BitmapText m_textSongOptions;