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

show regular score display in battle

Browse Source
This commit is contained in:
Chris Danford
2003-11-19 12:33:52 +00:00
parent 8eb94f73ca
commit 897cd94be5
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+28 -19
View File
@@ -310,7 +310,9 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
// LifeFrame goes below LifeMeter //
// Add LifeFrame
//
CString sLifeFrameName; CString sLifeFrameName;
if( bExtra ) if( bExtra )
sLifeFrameName = "ScreenGameplay extra life frame"; sLifeFrameName = "ScreenGameplay extra life frame";
@@ -324,7 +326,23 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
this->AddChild( &m_sprLifeFrame ); this->AddChild( &m_sprLifeFrame );
// //
// combined life meter // Add score frame
//
CString sScoreFrameName;
if( bExtra )
sScoreFrameName = "ScreenGameplay extra score frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sScoreFrameName = "ScreenGameplay oni score frame";
else
sScoreFrameName = "ScreenGameplay score frame";
m_sprScoreFrame.Load( THEME->GetPathToG(sScoreFrameName) );
m_sprScoreFrame.SetName( ssprintf("ScoreFrame%s",bExtra?"Extra":"") );
SET_XY( m_sprScoreFrame );
this->AddChild( &m_sprScoreFrame );
//
// Add combined life meter
// //
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
@@ -338,7 +356,7 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
} }
// //
// individual life meter // Add individual life meter
// //
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
@@ -346,7 +364,6 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
case PLAY_MODE_ONI: case PLAY_MODE_ONI:
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP:
case PLAY_MODE_ENDLESS: case PLAY_MODE_ENDLESS:
case PLAY_MODE_BATTLE:
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) && !SHOW_LIFE_METER_FOR_DISABLED_PLAYERS ) if( !GAMESTATE->IsPlayerEnabled(p) && !SHOW_LIFE_METER_FOR_DISABLED_PLAYERS )
@@ -370,10 +387,16 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
this->AddChild( m_pLifeMeter[p] ); this->AddChild( m_pLifeMeter[p] );
} }
break; break;
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE:
break;
} }
//
// Add stage / SongNumber
//
m_sprStage.SetName( ssprintf("Stage%s",bExtra?"Extra":"") ); m_sprStage.SetName( ssprintf("Stage%s",bExtra?"Extra":"") );
SET_XY( m_sprStage ); SET_XY( m_sprStage );
@@ -410,20 +433,6 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
} }
//
// Add all Actors in score frame
//
CString sScoreFrameName;
if( bExtra )
sScoreFrameName = "ScreenGameplay extra score frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sScoreFrameName = "ScreenGameplay oni score frame";
else
sScoreFrameName = "ScreenGameplay score frame";
m_sprScoreFrame.Load( THEME->GetPathToG(sScoreFrameName) );
m_sprScoreFrame.SetName( ssprintf("ScoreFrame%s",bExtra?"Extra":"") );
SET_XY( m_sprScoreFrame );
this->AddChild( &m_sprScoreFrame );
m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenGameplay song title") ); m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenGameplay song title") );
m_textSongTitle.EnableShadow( false ); m_textSongTitle.EnableShadow( false );
@@ -446,6 +455,7 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
{ {
case PLAY_MODE_ARCADE: case PLAY_MODE_ARCADE:
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP:
case PLAY_MODE_BATTLE:
if( PREFSMAN->m_bPercentageScoring ) if( PREFSMAN->m_bPercentageScoring )
m_pScoreDisplay[p] = new ScoreDisplayPercentage; m_pScoreDisplay[p] = new ScoreDisplayPercentage;
else else
@@ -455,7 +465,6 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
case PLAY_MODE_ENDLESS: case PLAY_MODE_ENDLESS:
m_pScoreDisplay[p] = new ScoreDisplayOni; m_pScoreDisplay[p] = new ScoreDisplayOni;
break; break;
case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE: case PLAY_MODE_RAVE:
m_pScoreDisplay[p] = new ScoreDisplayRave; m_pScoreDisplay[p] = new ScoreDisplayRave;
break; break;