diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp index 3958e81d00..676a75b1d6 100644 --- a/stepmania/src/ActorFrame.cpp +++ b/stepmania/src/ActorFrame.cpp @@ -278,18 +278,6 @@ void ActorFrame::UpdateInternal( float fDeltaTime ) } } -void ActorFrame::ProcessMessages( float fDeltaTime ) -{ - Actor::ProcessMessages( fDeltaTime ); - - // update all sub-Actors - for( vector::iterator it=m_SubActors.begin(); it!=m_SubActors.end(); ++it ) - { - Actor *pActor = *it; - pActor->ProcessMessages( fDeltaTime ); - } -} - #define PropagateActorFrameCommand( cmd ) \ void ActorFrame::cmd() \ { \ diff --git a/stepmania/src/ActorFrame.h b/stepmania/src/ActorFrame.h index cc52254698..b6bb09e5e9 100644 --- a/stepmania/src/ActorFrame.h +++ b/stepmania/src/ActorFrame.h @@ -42,7 +42,6 @@ public: virtual void RunCommandsOnLeaves( const LuaReference& cmds, const LuaReference *pParamTable = NULL ); /* but not on self */ virtual void UpdateInternal( float fDeltaTime ); - virtual void ProcessMessages( float fDeltaTime ); virtual void BeginDraw(); virtual void DrawPrimitives(); virtual void EndDraw(); diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index a45bf18a8b..0131f2200c 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -71,7 +71,6 @@ public: virtual void LoadFromSong( const Song *pSong ); virtual void Unload(); - virtual void ProcessMessages( float fDeltaTime ); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); @@ -106,7 +105,6 @@ protected: int FindBGSegmentForBeat( float fBeat ) const; void UpdateCurBGChange( const Song *pSong, float fLastMusicSeconds, float fCurrentTime, const map &mapNameToTransition ); - void ProcessMessages( float fDeltaTime ); map m_BGAnimations; vector m_aBGChanges; @@ -822,14 +820,6 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus m_pFadingBGA->Update( fDeltaTimeMusicRate ); } -void BackgroundImpl::Layer::ProcessMessages( float fDeltaTime ) -{ - if( m_pCurrentBGA ) - m_pCurrentBGA->ProcessMessages( fDeltaTime ); - if( m_pFadingBGA ) - m_pFadingBGA->ProcessMessages( fDeltaTime ); -} - void BackgroundImpl::Update( float fDeltaTime ) { ActorFrame::Update( fDeltaTime ); @@ -860,16 +850,6 @@ void BackgroundImpl::Update( float fDeltaTime ) m_fLastMusicSeconds = GAMESTATE->m_fMusicSeconds; } -void BackgroundImpl::ProcessMessages( float fDeltaTime ) -{ - ActorFrame::ProcessMessages( fDeltaTime ); - FOREACH_BackgroundLayer( i ) - { - Layer &layer = m_Layer[i]; - layer.ProcessMessages( fDeltaTime ); - } -} - void BackgroundImpl::DrawPrimitives() { if( PREFSMAN->m_fBGBrightness == 0.0f ) diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index fcb69926bb..ac6fe1c75e 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -259,10 +259,6 @@ void IMessageSubscriber::ClearMessages( const RString sMessage ) { } -void IMessageSubscriber::ProcessMessages( float fDeltaTime ) -{ -} - MessageSubscriber::MessageSubscriber( const MessageSubscriber &cpy ): IMessageSubscriber(cpy) { diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h index f5dae0a829..2002d5a42e 100644 --- a/stepmania/src/MessageManager.h +++ b/stepmania/src/MessageManager.h @@ -180,7 +180,6 @@ class IMessageSubscriber public: virtual ~IMessageSubscriber() { } virtual void HandleMessage( const Message &msg ) = 0; - virtual void ProcessMessages( float fDeltaTime ); void ClearMessages( const RString sMessage = "" ); private: diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 616453eed0..bc411fb32b 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -232,18 +232,6 @@ void NoteField::Update( float fDeltaTime ) NoteDisplay::Update( fDeltaTime ); } -void NoteField::ProcessMessages( float fDeltaTime ) -{ - ActorFrame::ProcessMessages( fDeltaTime ); - - /* If m_pCurDisplay is NULL, we're receiving a message before Load() was called. */ - if( m_pCurDisplay != NULL ) - { - m_pCurDisplay->m_ReceptorArrowRow.ProcessMessages( fDeltaTime ); - m_pCurDisplay->m_GhostArrowRow.ProcessMessages( fDeltaTime ); - } -} - float NoteField::GetWidth() const { const Style* pStyle = GAMESTATE->GetCurrentStyle(); diff --git a/stepmania/src/NoteField.h b/stepmania/src/NoteField.h index ae69b4b138..ada29b275d 100644 --- a/stepmania/src/NoteField.h +++ b/stepmania/src/NoteField.h @@ -20,7 +20,6 @@ public: NoteField(); ~NoteField(); virtual void Update( float fDeltaTime ); - virtual void ProcessMessages( float fDeltaTime ); virtual void DrawPrimitives(); virtual void Init( const PlayerState* pPlayerState, float fYReverseOffsetPixels ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 33791bb653..2109a74700 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -812,14 +812,6 @@ void Player::Update( float fDeltaTime ) ApplyWaitingTransforms(); } -void Player::ProcessMessages( float fDeltaTime ) -{ - ActorFrame::ProcessMessages( fDeltaTime ); - - if( m_pNoteField ) - m_pNoteField->ProcessMessages( fDeltaTime ); -} - void Player::ApplyWaitingTransforms() { for( unsigned j=0; jm_ModsToApply.size(); j++ ) diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index ded2983f06..23b13cd830 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -95,7 +95,6 @@ public: ~Player(); virtual void Update( float fDeltaTime ); - virtual void ProcessMessages( float fDeltaTime ); virtual void DrawPrimitives(); void Init( diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 413a934587..2879a17f9e 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -418,18 +418,6 @@ void ScreenManager::Update( float fDeltaTime ) for( unsigned i=0; iUpdate( fDeltaTime ); } - // - // Handle messages after updating. - // - { - for( unsigned i=0; iProcessMessages( fDeltaTime ); - - g_pSharedBGA->ProcessMessages( fDeltaTime ); - - for( unsigned i=0; iProcessMessages( fDeltaTime ); - } /* The music may be started on the first update. If we're reading from a CD, * it might not start immediately. Make sure we start playing the sound before