diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index fc84de0f7b..0c00590efb 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -1194,13 +1194,6 @@ void Actor::SetZTestModeString( const CString &s ) else ASSERT(0); } -void Actor::CopyTweening( const Actor &from ) -{ - m_current = from.m_current; - m_start = from.m_start; - m_Tweens = from.m_Tweens; -} - void Actor::Sleep( float time ) { BeginTweening( time, TWEEN_LINEAR ); diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 440ce59abe..609d3a263f 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -116,7 +116,6 @@ public: virtual void Update( float fDeltaTime ); // this can short circuit UpdateInternal virtual void UpdateInternal( float fDeltaTime ); // override this void UpdateTweening( float fDeltaTime ); - void CopyTweening( const Actor &from ); const CString &GetName() const { return m_sName; } virtual void SetName( const CString &sName ) { m_sName = sName; } diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp index 9b36911efc..c20807d0a4 100644 --- a/stepmania/src/GhostArrowRow.cpp +++ b/stepmania/src/GhostArrowRow.cpp @@ -138,17 +138,6 @@ void GhostArrowRow::SetHoldIsActive( int iCol ) m_HoldGhost[iCol]->SetHoldIsActive( true ); } -void GhostArrowRow::CopyTweening( const GhostArrowRow &from ) -{ - for( int c=0; cCopyTweening( *from.m_GhostDim[c] ); - m_GhostBright[c]->CopyTweening( *from.m_GhostBright[c] ); - m_HoldGhost[c]->CopyTweening( *from.m_HoldGhost[c] ); - } - ActorFrame::CopyTweening( from ); -} - /* * (c) 2001-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/GhostArrowRow.h b/stepmania/src/GhostArrowRow.h index 5973ec9f44..ae890adf20 100644 --- a/stepmania/src/GhostArrowRow.h +++ b/stepmania/src/GhostArrowRow.h @@ -17,7 +17,6 @@ public: virtual ~GhostArrowRow() { Unload(); } virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); - virtual void CopyTweening( const GhostArrowRow &from ); void Load( const PlayerState* pPlayerState, float fYReverseOffset ); void Unload(); diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 9812473eb8..7f9daa0072 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -162,17 +162,7 @@ void NoteField::Update( float fDeltaTime ) NoteDisplayCols *cur = SearchForSongBeat(); if( cur != LastDisplay ) - { - /* The display has changed. We might be in the middle of a step; copy any - * tweens. */ - if( LastDisplay ) - { - cur->m_GhostArrowRow.CopyTweening( LastDisplay->m_GhostArrowRow ); - cur->m_ReceptorArrowRow.CopyTweening( LastDisplay->m_ReceptorArrowRow ); - } - LastDisplay = cur; - } cur->m_ReceptorArrowRow.Update( fDeltaTime ); cur->m_GhostArrowRow.Update( fDeltaTime ); diff --git a/stepmania/src/ReceptorArrowRow.cpp b/stepmania/src/ReceptorArrowRow.cpp index cb9967c46a..5c02723aee 100644 --- a/stepmania/src/ReceptorArrowRow.cpp +++ b/stepmania/src/ReceptorArrowRow.cpp @@ -83,13 +83,6 @@ void ReceptorArrowRow::SetPressed( int iCol ) m_ReceptorArrow[iCol].SetPressed(); } -void ReceptorArrowRow::CopyTweening( const ReceptorArrowRow &from ) -{ - for( int c=0; c