From d9ccbede663a5d98ca5eda688c60f0439d289f11 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 24 Feb 2014 21:09:33 +0100
Subject: [PATCH] Removed unneeded code in Placeable.

---
 src/gameplaysceneclassic.cpp |  2 +-
 src/placeable.cpp            | 19 +------------------
 src/placeable.hpp            |  4 ----
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/gameplaysceneclassic.cpp b/src/gameplaysceneclassic.cpp
index 4b83eab..7c45008 100644
--- a/src/gameplaysceneclassic.cpp
+++ b/src/gameplaysceneclassic.cpp
@@ -29,7 +29,7 @@ namespace cloonel {
 		std::unique_ptr<Character> player(new Character("resources/graphics/player.png", SDLObject(), ushort2(80, 120)));
 
 		player->Prepare();
-		player->SwapMover(moverSine.get());
+		moverSine->RegisterPlaceable(player.get());
 
 		std::swap(moverSine, m_moverSine);
 		std::swap(player, m_player);
diff --git a/src/placeable.cpp b/src/placeable.cpp
index 73686dd..a76a324 100644
--- a/src/placeable.cpp
+++ b/src/placeable.cpp
@@ -6,24 +6,7 @@ namespace cloonel {
 	///--------------------------------------------------------------------------
 	///--------------------------------------------------------------------------
 	Placeable::Placeable (float2 parPos) :
-		m_pos(parPos),
-		m_mover(nullptr),
-		m_idForMover(0)
+		m_pos(parPos)
 	{
 	}
-
-	///--------------------------------------------------------------------------
-	///--------------------------------------------------------------------------
-	void Placeable::SwapMover (Mover* parMover) {
-		if (m_mover) {
-			assert(0 != m_idForMover);
-			m_mover->UnregisterPlaceable(m_idForMover);
-			m_idForMover = 0;
-			m_mover = nullptr;
-		}
-		if (parMover) {
-			m_idForMover = static_cast<int>(parMover->RegisterPlaceable(this));
-			m_mover = parMover;
-		}
-	}
 } //namespace cloonel
diff --git a/src/placeable.hpp b/src/placeable.hpp
index 915697f..0a7bc4b 100644
--- a/src/placeable.hpp
+++ b/src/placeable.hpp
@@ -11,16 +11,12 @@ namespace cloonel {
 		float2 GetPos ( void ) const noexcept;
 		void AddOffset ( const float2& parOffset ) noexcept;
 
-		void SwapMover ( Mover* parMover );
-
 	protected:
 		explicit Placeable ( float2 parPos );
 		~Placeable ( void ) noexcept = default;
 
 	private:
 		float2 m_pos;
-		Mover* m_mover;
-		int m_idForMover;
 	};
 
 	///--------------------------------------------------------------------------