From 178809ada32348ef12bf73b42337b1075a623918 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 21 Oct 2010 21:53:08 +0000
Subject: [PATCH] - changed resource faction cache to a map for better
 performance

---
 source/glest_game/type_instances/faction.cpp | 90 +++++++++-----------
 source/glest_game/type_instances/faction.h   |  4 +-
 2 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp
index d35c398a..0c1e719a 100644
--- a/source/glest_game/type_instances/faction.cpp
+++ b/source/glest_game/type_instances/faction.cpp
@@ -587,32 +587,24 @@ void Faction::resetResourceAmount(const ResourceType *rt){
 void Faction::addResourceTargetToCache(const Vec2i &pos) {
 	bool duplicateEntry = false;
 	if(cacheResourceTargetList.size() > 0) {
-		for(int i = 0; i < cacheResourceTargetList.size(); ++i) {
-			const Vec2i &cache = cacheResourceTargetList[i];
-			if(cache == pos) {
-				duplicateEntry = true;
-				break;
-			}
+		std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.find(pos);
+		if(iter != cacheResourceTargetList.end()) {
+			iter->second++;
+			duplicateEntry = true;
 		}
 	}
 	if(duplicateEntry == false) {
-		cacheResourceTargetList.push_back(pos);
+		cacheResourceTargetList[pos] = 1;
 	}
-
-	cleanupResourceTypeTargetCache();
 }
 
 void Faction::removeResourceTargetFromCache(const Vec2i &pos) {
 	if(cacheResourceTargetList.size() > 0) {
-		for(int i = 0; i < cacheResourceTargetList.size(); ++i) {
-			const Vec2i &cache = cacheResourceTargetList[i];
-			if(cache == pos) {
-				cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i);
-				break;
-			}
+		std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.find(pos);
+		if(iter != cacheResourceTargetList.end()) {
+			cacheResourceTargetList.erase(pos);
 		}
 	}
-	cleanupResourceTypeTargetCache();
 }
 
 void Faction::addCloseResourceTargetToCache(const Vec2i &pos) {
@@ -635,10 +627,11 @@ void Faction::addCloseResourceTargetToCache(const Vec2i &pos) {
 Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type) {
 	Vec2i result(-1);
 	if(cacheResourceTargetList.size() > 0) {
+		std::vector<Vec2i> deleteList;
 		const Map *map = world->getMap();
-		for(int i = 0; i < cacheResourceTargetList.size(); ++i) {
-			const Vec2i &cache = cacheResourceTargetList[i];
-
+		for(std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.begin();
+									  iter != cacheResourceTargetList.end(); ++iter) {
+			const Vec2i &cache = iter->first;
 			const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(cache));
 			if( sc != NULL && sc->getResource() != NULL) {
 				const Resource *resource = sc->getResource();
@@ -646,52 +639,49 @@ Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceT
 					if(result.x < 0 || unit->getPos().dist(cache) < unit->getPos().dist(result)) {
 						if(unit->isBadHarvestPos(cache) == false) {
 							result = cache;
-						}
-						else {
-							const int harvestDistance = 5;
-							int size = unit->getType()->getSize();
-							for(int j = -harvestDistance; j <= size; ++j) {
-								for(int k = -harvestDistance; k <= size; ++k) {
-									Vec2i newPos = unit->getPos() + Vec2i(j,k);
-									if(map->isInside(newPos.x, newPos.y)) {
-										Resource *r= map->getSurfaceCell(map->toSurfCoords(newPos))->getResource();
-										if(r != NULL) {
-											if(r->getType() == type) {
-												if(unit->isBadHarvestPos(newPos) == false) {
-													result= newPos;
-												}
-											}
-										}
-									}
-								}
+							// Close enough to our position, no more looking
+							if(unit->getPos().dist(result) <= 5) {
+								break;
 							}
-
 						}
 					}
 				}
 			}
+			else {
+				deleteList.push_back(cache);
+			}
 		}
+		cleanupResourceTypeTargetCache(&deleteList);
 	}
 
-	cleanupResourceTypeTargetCache();
-
 	return result;
 }
 
-void Faction::cleanupResourceTypeTargetCache() {
+void Faction::cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr) {
 	if(cacheResourceTargetList.size() > 0) {
-		for(int i = cacheResourceTargetList.size() - 1; i >= 0; --i) {
-			const Vec2i &cache = cacheResourceTargetList[i];
+		std::vector<Vec2i> deleteList;
+		if(deleteListPtr != NULL) {
+			deleteList = *deleteListPtr;
+		}
+		else {
+			for(std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.begin();
+										  iter != cacheResourceTargetList.end(); ++iter) {
+				const Vec2i &cache = iter->first;
 
-			if(world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache)) != NULL) {
-				Resource *resource = world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache))->getResource();
-				if(resource == NULL) {
-					cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i);
+				if(world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache)) != NULL) {
+					Resource *resource = world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache))->getResource();
+					if(resource == NULL) {
+						deleteList.push_back(cache);
+					}
+				}
+				else {
+					deleteList.push_back(cache);
 				}
 			}
-			else {
-				cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i);
-			}
+		}
+		for(int i = 0; i < deleteList.size(); ++i) {
+			Vec2i &cache = deleteList[i];
+			cacheResourceTargetList.erase(cache);
 		}
 	}
 }
diff --git a/source/glest_game/type_instances/faction.h b/source/glest_game/type_instances/faction.h
index dbf15c15..240032f5 100644
--- a/source/glest_game/type_instances/faction.h
+++ b/source/glest_game/type_instances/faction.h
@@ -84,7 +84,7 @@ private:
 	bool thisFaction;
 
 	std::map<Vec2i, std::vector<FactionPathSuccessCache> > successfulPathFinderTargetList;
-	std::vector<Vec2i> cacheResourceTargetList;
+	std::map<Vec2i,int> cacheResourceTargetList;
 
 public:
 	Faction();
@@ -160,7 +160,7 @@ public:
 	void removeResourceTargetFromCache(const Vec2i &pos);
 	void addCloseResourceTargetToCache(const Vec2i &pos);
 	Vec2i getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type);
-	void cleanupResourceTypeTargetCache();
+	void cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr);
 
 	std::string toString() const;