add PlayerState param to DifficutlyDisplay

This commit is contained in:
Chris Danford
2008-03-27 10:11:40 +00:00
parent 025ef16269
commit 7fff6b6afa
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -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 );
+1 -1
View File
@@ -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 );
+1 -1
View File
@@ -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 )
+1 -1
View File
@@ -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] );
}