From 51fdaebd0cac5252f136c675137c8a13b0dc9618 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <felixableitner@gmail.com>
Date: Sun, 28 Apr 2013 14:08:16 +0200
Subject: [PATCH] Removed unneeded World::remove functions

---
 source/World.cpp | 39 ++++++++-------------------------------
 source/World.h   |  2 --
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/source/World.cpp b/source/World.cpp
index 47c2bb5..851ac86 100755
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -31,20 +31,6 @@ World::insert(std::shared_ptr<Sprite> drawable) {
 		mDrawables[drawable->getCategory()].push_back(drawable);
 }
 
-/**
- * Removes a drawable from the group.
- */
-void
-World::remove(std::shared_ptr<Sprite> drawable) {
-	for (auto v = mDrawables.begin(); v != mDrawables.end(); v++) {
-		auto item = std::find(v->second.begin(), v->second.end(), drawable);
-		if (item != v->second.end()) {
-			   v->second.erase(item);
-			   break;
-		}
-	}
-}
-
 /**
  * Inserts a character into the world. A character can only be inserted once.
  * Also calls insert(character);
@@ -59,18 +45,6 @@ World::insertCharacter(std::shared_ptr<Character> character) {
 		insert(character);
 }
 
-/**
- * Removes a character from the world.
- * Also calls remove(character);
- */
-void
-World::removeCharacter(std::shared_ptr<Character> character) {
-	auto item = std::find(mCharacters.begin(), mCharacters.end(), character);
-	if (item != mCharacters.end())
-		   mCharacters.erase(item);
-	remove(character);
-}
-
 /**
  * Runs the A* path finding algorithm with areas as nodes and portals as edges.
  *
@@ -235,11 +209,11 @@ World::step(int elapsed) {
 			auto& spriteA = *it;
 			sf::Vector2f speed = spriteA->getSpeed() * (elapsed / 1000.0f);
 			if (spriteA->getDelete()) {
-				remove(spriteA);
+				v->second.erase(it);
 				it--;
 			}
 			// Apply movement for movable sprites.
-			else if ((*it)->getSpeed() != sf::Vector2f()) {
+			else if (spriteA->getSpeed() != sf::Vector2f()) {
 				bool overlap = false;
 				for (auto w = mDrawables.begin(); w != mDrawables.end(); w++) {
 					for (auto& spriteB : w->second) {
@@ -264,15 +238,18 @@ World::step(int elapsed) {
 
 /**
  * Calls Character::onThink for each character. Must be called
- * before step (so Characters get removed asap).
+ * before step so Characters get removed correctly.
  *
  * @param elapsed Time since last call.
  */
 void
 World::think(int elapsed) {
 	for (auto it = mCharacters.begin(); it != mCharacters.end(); ) {
-		if ((*it)->getDelete())
-			removeCharacter(*it);
+		if ((*it)->getDelete()) {
+			mCharacters.erase(it);
+			auto& d = mDrawables[Sprite::CATEGORY_ACTOR];
+			d.erase(std::find(d.begin(), d.end(), *it));
+		}
 		else {
 			(*it)->onThink(elapsed);
 			it++;
diff --git a/source/World.h b/source/World.h
index 860979f..a7d3b85 100755
--- a/source/World.h
+++ b/source/World.h
@@ -23,9 +23,7 @@ class Sprite;
 class World : public sf::Drawable {
 public:
 	void insert(std::shared_ptr<Sprite> drawable);
-	void remove(std::shared_ptr<Sprite> drawable);
 	void insertCharacter(std::shared_ptr<Character> character);
-	void removeCharacter(std::shared_ptr<Character> character);
 	void step(int elapsed);
 	void think(int elapsed);
 	void insertArea(const sf::IntRect& rect);