* fix (work-around) for apparent MSVC bug, in AStarNode::operator<()

 * removed some unused pathfinder stuff, and const-ified some other stuff
 * RoutePlanner is used in scenarios (for testing purposes...)

Author: James McCulloch

source/glest_game/ai/cartographer.cpp

@@ -12,7 +12,6 @@
 #include "cartographer.h"
 #include "game_constants.h"
 #include "route_planner.h"
-#include "node_map.h"
 
 #include "pos_iterator.h"
 
@@ -45,14 +44,6 @@ Cartographer::Cartographer(World *world)
 	int w = cellMap->getW(), h = cellMap->getH();
 
 	routePlanner = world->getRoutePlanner();
-
-	nodeMap = new NodeMap(cellMap);
-	GridNeighbours gNeighbours(w, h);
-	nmSearchEngine = new SearchEngine<NodeMap, GridNeighbours>(gNeighbours, nodeMap, true);
-	nmSearchEngine->setStorage(nodeMap);
-	nmSearchEngine->setInvalidKey(Vec2i(-1));
-	nmSearchEngine->getNeighbourFunc().setSearchSpace(ssCellMap);
-
 	masterMap = new AnnotatedMap(world);	
 	clusterMap = new ClusterMap(masterMap, this);
 
@@ -104,10 +95,8 @@ Cartographer::Cartographer(World *world)
 
 /** Destruct */
 Cartographer::~Cartographer() {
-	delete nodeMap;
 	delete masterMap;
 	delete clusterMap;
-	delete nmSearchEngine;
 
 	// Goal Maps
 	deleteMapValues(resourceMaps.begin(), resourceMaps.end());

source/glest_game/ai/cartographer.h

@@ -15,7 +15,6 @@
 #include "game_constants.h"
 #include "influence_map.h"
 #include "annotated_map.h"
-#include "node_map.h"
 #include "cluster_map.h"
 
 #include "world.h"
@@ -106,10 +105,6 @@ class Cartographer {
 	StoreMaps storeMaps;		/**< goal maps for resource stores */
 	SiteMaps siteMaps;			/**< goal maps for building sites */
 
-	// A* stuff
-	NodeMap *nodeMap;
-	SearchEngine<NodeMap,GridNeighbours> *nmSearchEngine;
-
 	World *world;
 	Map *cellMap;
 	RoutePlanner *routePlanner;
@@ -135,7 +130,6 @@ class Cartographer {
 	Cartographer(World *world);
 	virtual ~Cartographer();
 
-	SearchEngine<NodeMap,GridNeighbours>* getSearchEngine() { return nmSearchEngine; }
 	RoutePlanner* getRoutePlanner() { return routePlanner; }
 
 	/** Update the annotated maps when an obstacle has been added or removed from the map.