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

Added oni-specific gamplay top frame and gameplay bottom frame

Browse Source
This commit is contained in:
Chris Danford
2002-09-10 16:57:13 +00:00
parent 65ac3e43e8
commit 808cf1b502
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
+8 -2
View File
@@ -50,10 +50,16 @@ LifeMeterBar::LifeMeterBar()
m_quadBlackBackground.SetZoomY( (float)m_iMeterHeight ); m_quadBlackBackground.SetZoomY( (float)m_iMeterHeight );
m_frame.AddChild( &m_quadBlackBackground ); 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_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_frame.AddChild( &m_sprStreamHot );
m_sprFrame.Load( THEME->GetPathTo("Graphics","gameplay lifemeter bar") ); m_sprFrame.Load( THEME->GetPathTo("Graphics","gameplay lifemeter bar") );
stepmania/src/ScreenGameplay.cpp
+16 -2
View File
@@ -202,7 +202,14 @@ ScreenGameplay::ScreenGameplay()
} }
// TopFrame goes above LifeMeter // 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) ); m_sprTopFrame.SetXY( TOP_FRAME_X, TOP_FRAME_Y(bExtra) );
this->AddChild( &m_sprTopFrame ); this->AddChild( &m_sprTopFrame );
@@ -241,7 +248,14 @@ ScreenGameplay::ScreenGameplay()
// //
// Add all Actors in bottom frame // 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) ); m_sprBottomFrame.SetXY( BOTTOM_FRAME_X, BOTTOM_FRAME_Y(bExtra) );
this->AddChild( &m_sprBottomFrame ); this->AddChild( &m_sprBottomFrame );