From 223ca0072866a9d0a06c959e95984687675d6a14 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 9 Jan 2005 01:17:51 +0000 Subject: [PATCH] Sprite -> AutoActor --- stepmania/src/MusicWheel.cpp | 30 +++++++++++++++--------------- stepmania/src/MusicWheel.h | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 4eedd34e9b..7097ed0634 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -96,10 +96,10 @@ void MusicWheel::Load() GAMESTATE->m_CurStyle = GAMEMAN->STYLE_DANCE_SINGLE; */ - m_sprSelectionOverlay.SetName( "Highlight" ); - m_sprSelectionOverlay.Load( THEME->GetPathToG("MusicWheel highlight") ); - this->AddChild( &m_sprSelectionOverlay ); - UtilOnCommand( &m_sprSelectionOverlay, "MusicWheel" ); + m_sprHighlight.Load( THEME->GetPathToG("MusicWheel highlight") ); + m_sprHighlight->SetName( "Highlight" ); + this->AddChild( m_sprHighlight ); + UtilOnCommand( m_sprHighlight, "MusicWheel" ); m_ScrollBar.SetX( SCROLL_BAR_X ); m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT ); @@ -1335,16 +1335,16 @@ void MusicWheel::TweenOnScreen(bool changing_sort) { m_WheelState = STATE_TWEENING_ON_SCREEN; - SetItemPosition( m_sprSelectionOverlay, 0 ); + SetItemPosition( *m_sprHighlight, 0 ); - COMMAND( m_sprSelectionOverlay, "StartOn"); + COMMAND( m_sprHighlight, "StartOn"); if( changing_sort ) { const float delay = fabsf(NUM_WHEEL_ITEMS/2-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET; - m_sprSelectionOverlay.BeginTweening( delay ); // sleep - COMMAND( m_sprSelectionOverlay, "FinishOnSort"); + m_sprHighlight->BeginTweening( delay ); // sleep + COMMAND( m_sprHighlight, "FinishOnSort"); } else { - COMMAND( m_sprSelectionOverlay, "FinishOn"); + COMMAND( m_sprHighlight, "FinishOn"); } m_ScrollBar.SetX( SCROLL_BAR_X ); @@ -1380,20 +1380,20 @@ void MusicWheel::TweenOffScreen(bool changing_sort) { m_WheelState = STATE_TWEENING_OFF_SCREEN; - SetItemPosition( m_sprSelectionOverlay, 0 ); + SetItemPosition( *m_sprHighlight, 0 ); - COMMAND( m_sprSelectionOverlay, "StartOff"); + COMMAND( m_sprHighlight, "StartOff"); if(changing_sort) { /* When changing sort, tween the overlay with the item in the center; * having it separate looks messy when we're moving fast. */ const float delay = fabsf(NUM_WHEEL_ITEMS/2-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET; - m_sprSelectionOverlay.BeginTweening( delay ); // sleep - COMMAND( m_sprSelectionOverlay, "FinishOffSort"); + m_sprHighlight->BeginTweening( delay ); // sleep + COMMAND( m_sprHighlight, "FinishOffSort"); } else { - COMMAND( m_sprSelectionOverlay, "FinishOff"); + COMMAND( m_sprHighlight, "FinishOff"); } - COMMAND( m_sprSelectionOverlay, "FinishOff"); + COMMAND( m_sprHighlight, "FinishOff"); m_ScrollBar.BeginTweening( 0 ); m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE ); diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index b155a107f1..b8ec08fc11 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -3,7 +3,7 @@ #ifndef MUSICWHEEL_H #define MUSICWHEEL_H -#include "Sprite.h" +#include "ActorUtil.h" #include "ActorFrame.h" #include "RageSound.h" #include "RandomSample.h" @@ -82,7 +82,7 @@ protected: void ChangeMusic(int dist); /* +1 or -1 */ ScrollBar m_ScrollBar; - Sprite m_sprSelectionOverlay; + AutoActor m_sprHighlight; vector m_WheelItemDatas[NUM_SORT_ORDERS]; vector m_CurWheelItemData;