Actor::Reset() -> private Actor::InitDefaults().

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
+void Actor::InitDefaults()
- * that shouldn't change the position of the actor. */
-void Actor::Reset()
 {
 	StopTweening();
 
@@ -118,7 +116,7 @@ Actor::Actor()
 {
 	m_pLuaInstance = new LuaClass;
 	m_size = RageVector2( 1, 1 );
-	Reset();
+	InitDefaults();
 	m_bFirstUpdate = true;
 }
 

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
 	//