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

Simplify.

Browse Source
This commit is contained in:
Steve Checkoway
2006-08-06 02:37:42 +00:00
parent a89e8b9cb2
commit ba0d51cc7a
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
m_sprLabel->StopTweening();
m_textBPM.BeginTweening(0.5f);
m_sprLabel->BeginTweening(0.5f);
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
m_textBPM.SetDiffuse( EXTRA_COLOR );
m_sprLabel->SetDiffuse( EXTRA_COLOR );
stepmania/src/LifeMeterBar.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ LifeMeterBar::LifeMeterBar()
this->AddChild( &m_quadDangerGlow );
m_pStream = new StreamDisplay;
bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2();
bool bExtra = GAMESTATE->IsAnExtraStage();
RString sExtra = bExtra ? "extra " : "";
m_pStream->Load(
METER_WIDTH,
@@ -336,7 +336,7 @@ void LifeMeterBar::UpdateNonstopLifebar(const int cleared,
// if (cleared > total) cleared = total; // clear/total <= 1
// if (total == 0) total = 1; // no division by 0
if (GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2())
if (GAMESTATE->IsAnExtraStage())
{ // extra stage is its own thing, should not be progressive
// and it should be as difficult as life 4
// (e.g. it should not depend on life settings)
stepmania/src/LifeMeterTime.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void LifeMeterTime::Load( const PlayerState *pPlayerState, PlayerStageStats *pPl
this->AddChild( &m_quadDangerGlow );
m_pStream = new StreamDisplay;
bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2();
bool bExtra = GAMESTATE->IsAnExtraStage();
RString sExtra = bExtra ? "extra " : "";
m_pStream->Load(
METER_WIDTH,
stepmania/src/MusicWheel.cpp
+3 -3
View File
@@ -102,7 +102,7 @@ void MusicWheel::Load( RString sType )
m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") );
m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true );
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
// make the preferred group the group of the last song played.
if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL && !PREFSMAN->m_bPickExtraStage )
@@ -400,7 +400,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SortOrder so, const RStr
/* Hack: Add extra stage item if it was eliminated for any reason (eg. it's a long
* song). */
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
Song* pSong;
Steps* pSteps;
@@ -593,7 +593,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
arrayWheelItemDatas.push_back( WheelItemData(TYPE_PORTAL, NULL, "", NULL, RageColor(1,0,0,1)) );
}
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
Song* pSong;
Steps* pSteps;
stepmania/src/ScreenGameplay.cpp
+4 -4
View File
@@ -720,7 +720,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
m_soundAssistTick.Load( THEME->GetPathS(m_sName,"assist tick"), true );
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) // only load if we're going to use it
if( GAMESTATE->IsAnExtraStage() ) // only load if we're going to use it
{
m_textSurviveTime.LoadFromFont( THEME->GetPathF(m_sName,"survive time") );
m_textSurviveTime.SetShadowLength( 0 );
@@ -2036,7 +2036,7 @@ void ScreenGameplay::BeginBackingOutFromGameplay()
if( GAMESTATE->IsFinalStage() )
GAMESTATE->m_bBackedOutOfFinalStage = true;
// Disallow backing out of extra stage
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );
else
m_Cancel.StartTransitioning( SM_DoPrevScreen );
@@ -2263,7 +2263,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_PlayGo )
{
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
SOUND->PlayOnceFromAnnouncer( "gameplay here we go extra" );
else if( GAMESTATE->IsFinalStage() )
SOUND->PlayOnceFromAnnouncer( "gameplay here we go final" );
@@ -2512,7 +2512,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
m_Failed.StartTransitioning( SM_DoNextScreen );
// show the survive time if extra stage
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
float fMaxSurviveSeconds = 0;
FOREACH_EnabledPlayer(p)
stepmania/src/ScreenSelectMusic.cpp
+3 -3
View File
@@ -850,7 +850,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
{
if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) )
{
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
m_soundLocked.Play();
else
ChangeDifficulty( pn, -1 );
@@ -858,7 +858,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
}
if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) )
{
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
m_soundLocked.Play();
else
ChangeDifficulty( pn, +1 );
@@ -1531,7 +1531,7 @@ void ScreenSelectMusic::AfterMusicChange()
if ( PREFSMAN->m_bShowBanners )
g_sBannerPath = pSong->GetBannerPath();
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
m_BPMDisplay.CycleRandomly();
}