From 17efa3412d9a0066de642716f3ba125a721daec3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 16 Oct 2005 02:22:33 +0000 Subject: [PATCH] Actor::Reset() -> private Actor::InitDefaults(). --- stepmania/src/Actor.cpp | 6 ++---- stepmania/src/Actor.h | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index b74652ba7c..cb285cc262 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -46,9 +46,7 @@ void Actor::SetBGMLight( int iLightNumber, float fCabinetLights ) g_fCabinetLights[iLightNumber] = fCabinetLights; } -/* This is Reset instead of Init since many derived classes have Init() functions - * that shouldn't change the position of the actor. */ -void Actor::Reset() +void Actor::InitDefaults() { StopTweening(); @@ -118,7 +116,7 @@ Actor::Actor() { m_pLuaInstance = new LuaClass; m_size = RageVector2( 1, 1 ); - Reset(); + InitDefaults(); m_bFirstUpdate = true; } diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 2a0eea91af..8a6fead0d5 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -30,7 +30,6 @@ public: virtual ~Actor(); virtual Actor *Copy() const; void UnsubcribeAndClearCommands(); - virtual void Reset(); virtual void LoadFromNode( const CString& sDir, const XNode* pNode ); bool IsType( const CString &sType ); @@ -464,6 +463,8 @@ protected: static float g_fCurrentBGMTime, g_fCurrentBGMBeat; private: + void InitDefaults(); + // // commands //