add PlayerState param to DifficutlyDisplay
This commit is contained in:
@@ -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 );
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag
|
||||
PlayerState* pPlayerState_ = const_cast<PlayerState*>(pPlayerState);
|
||||
PlayerStageStats* pPlayerStageStats_ = const_cast<PlayerStageStats*>(pPlayerStageStats);
|
||||
|
||||
Message msg("Init");
|
||||
Message msg("Load");
|
||||
msg.SetParam( "PlayerState", LuaReference::CreateFromPush(*pPlayerState_) );
|
||||
msg.SetParam( "PlayerStageStats", LuaReference::CreateFromPush(*pPlayerStageStats_) );
|
||||
this->HandleMessage( msg );
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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] );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user