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

add PlayerState param to DifficutlyDisplay

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EditMenu.cpp
+2 -2
View File
@@ -174,12 +174,12 @@ void EditMenu::Load( const RString &sType )
this->AddChild( &m_SongTextBanner ); this->AddChild( &m_SongTextBanner );
m_Meter.SetName( "Meter" ); m_Meter.SetName( "Meter" );
m_Meter.Load( "DifficultyDisplayEdit" ); m_Meter.Load( "DifficultyDisplayEdit", NULL );
ActorUtil::SetXY( m_Meter, sType ); ActorUtil::SetXY( m_Meter, sType );
this->AddChild( &m_Meter ); this->AddChild( &m_Meter );
m_SourceMeter.SetName( "SourceMeter" ); m_SourceMeter.SetName( "SourceMeter" );
m_SourceMeter.Load( "DifficultyDisplayEdit" ); m_SourceMeter.Load( "DifficultyDisplayEdit", NULL );
ActorUtil::SetXY( m_SourceMeter, sType ); ActorUtil::SetXY( m_SourceMeter, sType );
this->AddChild( &m_SourceMeter ); this->AddChild( &m_SourceMeter );
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag
PlayerState* pPlayerState_ = const_cast<PlayerState*>(pPlayerState); PlayerState* pPlayerState_ = const_cast<PlayerState*>(pPlayerState);
PlayerStageStats* pPlayerStageStats_ = const_cast<PlayerStageStats*>(pPlayerStageStats); PlayerStageStats* pPlayerStageStats_ = const_cast<PlayerStageStats*>(pPlayerStageStats);
Message msg("Init"); Message msg("Load");
msg.SetParam( "PlayerState", LuaReference::CreateFromPush(*pPlayerState_) ); msg.SetParam( "PlayerState", LuaReference::CreateFromPush(*pPlayerState_) );
msg.SetParam( "PlayerStageStats", LuaReference::CreateFromPush(*pPlayerStageStats_) ); msg.SetParam( "PlayerStageStats", LuaReference::CreateFromPush(*pPlayerStageStats_) );
this->HandleMessage( msg ); this->HandleMessage( msg );
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -625,7 +625,7 @@ void ScreenGameplay::Init()
// //
ASSERT( pi->m_pDifficultyDisplay == NULL ); ASSERT( pi->m_pDifficultyDisplay == NULL );
pi->m_pDifficultyDisplay = new DifficultyDisplay; 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()) ); pi->m_pDifficultyDisplay->SetName( ssprintf("DifficultyDisplay%s",pi->GetName().c_str()) );
PlayerNumber pn = pi->GetStepsAndTrailIndex(); PlayerNumber pn = pi->GetStepsAndTrailIndex();
if( pn != PlayerNumber_Invalid ) if( pn != PlayerNumber_Invalid )
stepmania/src/ScreenNetSelectMusic.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ void ScreenNetSelectMusic::Init()
m_DC[p] = GAMESTATE->m_PreferredDifficulty[p]; m_DC[p] = GAMESTATE->m_PreferredDifficulty[p];
m_DifficultyDisplays[p].SetName( ssprintf("MeterP%d",p+1) ); 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] ); LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyDisplays[p] );
this->AddChild( &m_DifficultyDisplays[p] ); this->AddChild( &m_DifficultyDisplays[p] );
} }