From 7fff6b6afa5c210de5c74443f117f7c8461fed7b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 27 Mar 2008 10:11:40 +0000 Subject: [PATCH] add PlayerState param to DifficutlyDisplay --- stepmania/src/EditMenu.cpp | 4 ++-- stepmania/src/ScoreDisplayNormal.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- stepmania/src/ScreenNetSelectMusic.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index cea04a4cba..3328c6ec7d 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -174,12 +174,12 @@ void EditMenu::Load( const RString &sType ) this->AddChild( &m_SongTextBanner ); m_Meter.SetName( "Meter" ); - m_Meter.Load( "DifficultyDisplayEdit" ); + m_Meter.Load( "DifficultyDisplayEdit", NULL ); ActorUtil::SetXY( m_Meter, sType ); this->AddChild( &m_Meter ); m_SourceMeter.SetName( "SourceMeter" ); - m_SourceMeter.Load( "DifficultyDisplayEdit" ); + m_SourceMeter.Load( "DifficultyDisplayEdit", NULL ); ActorUtil::SetXY( m_SourceMeter, sType ); this->AddChild( &m_SourceMeter ); diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp index 254e29b376..6b80f26ab1 100644 --- a/stepmania/src/ScoreDisplayNormal.cpp +++ b/stepmania/src/ScoreDisplayNormal.cpp @@ -37,7 +37,7 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag PlayerState* pPlayerState_ = const_cast(pPlayerState); PlayerStageStats* pPlayerStageStats_ = const_cast(pPlayerStageStats); - Message msg("Init"); + Message msg("Load"); msg.SetParam( "PlayerState", LuaReference::CreateFromPush(*pPlayerState_) ); msg.SetParam( "PlayerStageStats", LuaReference::CreateFromPush(*pPlayerStageStats_) ); this->HandleMessage( msg ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 0fd504c260..ad3a9bb7dd 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -625,7 +625,7 @@ void ScreenGameplay::Init() // ASSERT( pi->m_pDifficultyDisplay == NULL ); pi->m_pDifficultyDisplay = new DifficultyDisplay; - pi->m_pDifficultyDisplay->Load("DifficultyDisplayGameplay"); + pi->m_pDifficultyDisplay->Load("DifficultyDisplayGameplay", pi->GetPlayerState() ); pi->m_pDifficultyDisplay->SetName( ssprintf("DifficultyDisplay%s",pi->GetName().c_str()) ); PlayerNumber pn = pi->GetStepsAndTrailIndex(); if( pn != PlayerNumber_Invalid ) diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 223909122e..2cfe319297 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -68,7 +68,7 @@ void ScreenNetSelectMusic::Init() m_DC[p] = GAMESTATE->m_PreferredDifficulty[p]; m_DifficultyDisplays[p].SetName( ssprintf("MeterP%d",p+1) ); - m_DifficultyDisplays[p].Load( "DifficultyDisplay" ); + m_DifficultyDisplays[p].Load( "DifficultyDisplay", NULL ); LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyDisplays[p] ); this->AddChild( &m_DifficultyDisplays[p] ); }