From a4c6b21b1ea0c0f05a6be8e5d4ea76ee77623d93 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 7 Aug 2011 18:50:57 -0500 Subject: [PATCH] [BeginnerHelper] Made BeginnerHelper run the OnCommand. Also added missing files and fixed metrics. --- Docs/Changelog_sm5.txt | 1 + .../_fallback/Graphics/BeginnerHelper background.redir | 1 + Themes/_fallback/Graphics/BeginnerHelper flash.redir | 1 + .../_fallback/Graphics/BeginnerHelper stepcircle.redir | 1 + Themes/_fallback/metrics.ini | 10 +++++----- src/BeginnerHelper.cpp | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 Themes/_fallback/Graphics/BeginnerHelper background.redir create mode 100644 Themes/_fallback/Graphics/BeginnerHelper flash.redir create mode 100644 Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index df2db06e55..cf44a49c24 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -15,6 +15,7 @@ StepMania 5.0 Preview 3 | 20110??? * [TimingData] Add HasDelays() Lua binding; HasStops() now only checks stops. [AJ] * [GameState, SongUtil] Fix Issue 263 by not charging 2x stages for doubles when not using joint premium. [AJ] +* [BeginnerHelper] Made BeginnerHelper run the OnCommand. [AJ] 2011/08/06 ---------- diff --git a/Themes/_fallback/Graphics/BeginnerHelper background.redir b/Themes/_fallback/Graphics/BeginnerHelper background.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper background.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/BeginnerHelper flash.redir b/Themes/_fallback/Graphics/BeginnerHelper flash.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper flash.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir b/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 4c51e8c250..e98c1152ab 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -230,14 +230,14 @@ ScrollSortOrder=false ScrollSpeedDivisor=2 [BeginnerHelper] -HelperX=SCREEN_CENTER_X -HelperY=SCREEN_CENTER_Y+80 +HelperX=0 +HelperY=SCREEN_CENTER_Y-80 # All X,Y coordinates are relative to the HelperX,Y -Player1X=-125 +Player1X=-(SCREEN_CENTER_X/2) PlayerP1OnCommand=halign,0;rotationx,40;zoom,20 -Player2X=195 -PlayerP2OnCommand=halign,0;rotationx,40;zoom,20 +Player2X=(SCREEN_CENTER_X/2) +PlayerP2OnCommand=halign,1;rotationx,40;zoom,20 ShowDancePad=false # "Pad should always be 3 units bigger in zoom than the dancer." diff --git a/src/BeginnerHelper.cpp b/src/BeginnerHelper.cpp index 6781aaac10..5fe57b0c64 100644 --- a/src/BeginnerHelper.cpp +++ b/src/BeginnerHelper.cpp @@ -167,7 +167,7 @@ bool BeginnerHelper::Init( int iDancePadType ) m_pDancer[pl]->PlayAnimation( "rest" ); m_pDancer[pl]->SetX( HELPER_X+PLAYER_X(pl) ); m_pDancer[pl]->SetY( HELPER_Y+10 ); - ActorUtil::LoadAllCommands( m_pDancer[pl], "BeginnerHelper" ); + ActorUtil::LoadAllCommandsAndOnCommand( m_pDancer[pl], "BeginnerHelper" ); // many of the models floating around have the vertex order flipped, so force this. m_pDancer[pl]->SetCullMode( CULL_NONE ); }