diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 2016806128..32454ccac7 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -13,6 +13,12 @@ _____________________________________________________________________________ sm-ssc v1.2 | 201012xx -------------------------------------------------------------------------------- +20101229 +-------- +* [ScreenHowToPlay] Replaced LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND macro + calls with ActorUtil::LoadAllCommandsAndSetXY(). Fixes an odd bug I ran into + during the porting of DDR 5th Mix. [freem] + 20101228 -------- * [ScreenHowToPlay] Have Character ignore the Miss steps instead of trying to diff --git a/src/ScreenHowToPlay.cpp b/src/ScreenHowToPlay.cpp index 07c3ec6fb9..552eee8783 100644 --- a/src/ScreenHowToPlay.cpp +++ b/src/ScreenHowToPlay.cpp @@ -84,7 +84,7 @@ void ScreenHowToPlay::Init() m_pmDancePad->LoadMilkshapeAscii( GetAnimPath(ANIM_DANCE_PAD) ); // xxx: hardcoded rotation. can be undone, but still. -freem m_pmDancePad->SetRotationX( 35 ); - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_pmDancePad ); + ActorUtil::LoadAllCommandsAndSetXY( m_pmDancePad, m_sName ); } // Display a character @@ -118,7 +118,7 @@ void ScreenHowToPlay::Init() // xxx: hardcoded rotation. can be undone, but still. -freem m_pmCharacter->SetRotationX( 40 ); m_pmCharacter->SetCullMode( CULL_NONE ); // many of the models floating around have the vertex order flipped - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_pmCharacter ); + ActorUtil::LoadAllCommandsAndSetXY( m_pmCharacter, m_sName ); } } @@ -129,7 +129,7 @@ void ScreenHowToPlay::Init() m_pLifeMeterBar = new LifeMeterBar; m_pLifeMeterBar->SetName("LifeMeterBar"); m_pLifeMeterBar->Load( GAMESTATE->m_pPlayerState[PLAYER_1], &STATSMAN->m_CurStageStats.m_player[PLAYER_1] ); - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_pLifeMeterBar ); + ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); SMLoader::LoadFromSMFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); @@ -162,7 +162,7 @@ void ScreenHowToPlay::Init() m_Player.Load( m_NoteData ); m_Player->SetName( "Player" ); this->AddChild( m_Player ); - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_Player ); + ActorUtil::LoadAllCommandsAndSetXY( m_Player, m_sName ); // Don't show judgement PO_GROUP_ASSIGN( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_fBlind, 1.0f );