From 808cf1b5029114aaa63373517c64fb0ec10f43ff Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 10 Sep 2002 16:57:13 +0000 Subject: [PATCH] Added oni-specific gamplay top frame and gameplay bottom frame --- stepmania/src/LifeMeterBar.cpp | 10 ++++++++-- stepmania/src/ScreenGameplay.cpp | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index e0c9f92c9d..8718c52fcc 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -50,10 +50,16 @@ LifeMeterBar::LifeMeterBar() m_quadBlackBackground.SetZoomY( (float)m_iMeterHeight ); m_frame.AddChild( &m_quadBlackBackground ); - m_sprStreamNormal.Load( THEME->GetPathTo("Graphics",(GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2())?"gameplay extra lifemeter stream normal":"gameplay lifemeter stream normal") ); + if( GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2() ) + m_sprStreamNormal.Load( THEME->GetPathTo("Graphics","gameplay extra lifemeter stream normal") ); + else + m_sprStreamNormal.Load( THEME->GetPathTo("Graphics","gameplay lifemeter stream normal") ); m_frame.AddChild( &m_sprStreamNormal ); - m_sprStreamHot.Load( THEME->GetPathTo("Graphics",(GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2())?"gameplay extra lifemeter stream hot":"gameplay lifemeter stream hot") ); + if( GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2() ) + m_sprStreamHot.Load( THEME->GetPathTo("Graphics","gameplay extra lifemeter stream hot") ); + else + m_sprStreamHot.Load( THEME->GetPathTo("Graphics","gameplay lifemeter stream hot") ); m_frame.AddChild( &m_sprStreamHot ); m_sprFrame.Load( THEME->GetPathTo("Graphics","gameplay lifemeter bar") ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 5d1c65dfbd..e67be9e1aa 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -202,7 +202,14 @@ ScreenGameplay::ScreenGameplay() } // TopFrame goes above LifeMeter - m_sprTopFrame.Load( THEME->GetPathTo("Graphics",bExtra?"gameplay extra top frame":"gameplay top frame") ); + CString sTopFrameName; + if( bExtra ) + sTopFrameName = "gameplay extra top frame"; + else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) + sTopFrameName = "gameplay oni top 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 ); @@ -241,7 +248,14 @@ ScreenGameplay::ScreenGameplay() // // Add all Actors in bottom frame // - m_sprBottomFrame.Load( THEME->GetPathTo("Graphics",bExtra?"gameplay extra bottom frame":"gameplay bottom frame") ); + CString sBottomFrameName; + if( bExtra ) + sBottomFrameName = "gameplay extra bottom frame"; + else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) + sBottomFrameName = "gameplay oni bottom 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 );