From b8923910d5a98ef5c43f20bbe2d27fe4cba03f86 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 20:31:51 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenGameplay.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 55459ca343..78c9b0fa3d 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -707,6 +707,15 @@ void ScreenGameplay::Init() pi->m_pDifficultyMeter->Load( m_sName + ssprintf(" DifficultyMeter%s",pi->GetName().c_str()) ); /* Position it in LoadNextSong. */ this->AddChild( pi->m_pDifficultyMeter ); + +// switch( GAMESTATE->m_PlayMode ) +// { +// case PLAY_MODE_BATTLE: +// pi->m_pInventory = new Inventory; +// pi->m_pInventory->Load( p ); +// this->AddChild( pi->m_pInventory ); +// break; +// } } @@ -720,18 +729,6 @@ void ScreenGameplay::Init() this->AddChild( &m_BPMDisplay ); m_fLastBPS = 0; - FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi ) - { -// switch( GAMESTATE->m_PlayMode ) -// { -// case PLAY_MODE_BATTLE: -// pi->m_pInventory = new Inventory; -// pi->m_pInventory->Load( p ); -// this->AddChild( pi->m_pInventory ); -// break; -// } - } - if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it { m_Ready.Load( THEME->GetPathB(m_sName,"ready") );