From 8bbbe403ad5267354bba9b8798af5cf41ad4b1db Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 25 Oct 2010 22:02:36 +0000
Subject: [PATCH] - more performance improvements for resource cache logic (try
 to avoid repetitive caching logic when it was already done once)

---
 source/glest_game/ai/path_finder.cpp         |  2 +-
 source/glest_game/type_instances/faction.cpp | 26 +++++++++++---------
 source/glest_game/type_instances/faction.h   |  1 +
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/source/glest_game/ai/path_finder.cpp b/source/glest_game/ai/path_finder.cpp
index b67b519b..3ddbf8f1 100644
--- a/source/glest_game/ai/path_finder.cpp
+++ b/source/glest_game/ai/path_finder.cpp
@@ -359,7 +359,7 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
 		}
 	}//while
 
-	if(chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld, openNodes.empty() = %d, pathFound = %d, nodeLimitReached = %d, unit = %s\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis(),openNodes.empty(),pathFound,nodeLimitReached,unit->getFullName().c_str());
+	if(chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld, openNodes.size() = %d, pathFound = %d, nodeLimitReached = %d, unit = %s\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis(),openNodes.size(),pathFound,nodeLimitReached,unit->getFullName().c_str());
 
 	Node *lastNode= node;
 
diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp
index 93e93444..66067625 100644
--- a/source/glest_game/type_instances/faction.cpp
+++ b/source/glest_game/type_instances/faction.cpp
@@ -700,21 +700,25 @@ void Faction::removeResourceTargetFromCache(const Vec2i &pos) {
 }
 
 void Faction::addCloseResourceTargetToCache(const Vec2i &pos) {
-	const Map *map = world->getMap();
-	const int harvestDistance = 5;
-	for(int j = -harvestDistance; j <= harvestDistance; ++j) {
-		for(int k = -harvestDistance; k <= harvestDistance; ++k) {
-			Vec2i newPos = pos + Vec2i(j,k);
-			if(isResourceTargetInCache(newPos) == false) {
-				if(map->isInside(newPos.x, newPos.y)) {
-					Resource *r = map->getSurfaceCell(map->toSurfCoords(newPos))->getResource();
-					if(r != NULL) {
-						//addResourceTargetToCache(newPos);
-						cacheResourceTargetList[newPos] = 1;
+	if(cachedCloseResourceTargetLookupList.find(pos) == cachedCloseResourceTargetLookupList.end()) {
+		const Map *map = world->getMap();
+		const int harvestDistance = 5;
+		for(int j = -harvestDistance; j <= harvestDistance; ++j) {
+			for(int k = -harvestDistance; k <= harvestDistance; ++k) {
+				Vec2i newPos = pos + Vec2i(j,k);
+				if(isResourceTargetInCache(newPos) == false) {
+					if(map->isInside(newPos.x, newPos.y)) {
+						Resource *r = map->getSurfaceCell(map->toSurfCoords(newPos))->getResource();
+						if(r != NULL) {
+							//addResourceTargetToCache(newPos);
+							cacheResourceTargetList[newPos] = 1;
+						}
 					}
 				}
 			}
 		}
+
+		cachedCloseResourceTargetLookupList[pos] = true;
 	}
 }
 
diff --git a/source/glest_game/type_instances/faction.h b/source/glest_game/type_instances/faction.h
index b7e032ab..3c9dd4bb 100644
--- a/source/glest_game/type_instances/faction.h
+++ b/source/glest_game/type_instances/faction.h
@@ -85,6 +85,7 @@ private:
 
 	std::map<Vec2i, std::vector<FactionPathSuccessCache> > successfulPathFinderTargetList;
 	std::map<Vec2i,int> cacheResourceTargetList;
+	std::map<Vec2i,bool> cachedCloseResourceTargetLookupList;
 	time_t lastResourceTargettListPurge;
 
 public: