From 9992f9cb79f8520385948775b51cb60b1dfb9ba7 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 16 Jul 2010 16:24:55 +0000 Subject: [PATCH] fixed minor compiler issues in linux for new pathfinder changes --- source/glest_game/ai/cluster_map.cpp | 3 ++- source/glest_game/ai/route_planner.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/glest_game/ai/cluster_map.cpp b/source/glest_game/ai/cluster_map.cpp index 186c27a3..1e20b256 100644 --- a/source/glest_game/ai/cluster_map.cpp +++ b/source/glest_game/ai/cluster_map.cpp @@ -409,7 +409,8 @@ float ClusterMap::aStarPathLength(Field f, int size, const Vec2i &start, const V DiagonalDistance dd(dest); se->setNodeLimit(GameConstants::clusterSize * GameConstants::clusterSize); se->setStart(start, dd(start)); - AStarResult res = se->aStar(PosGoal(dest), costFunc, dd); + PosGoal goal(dest); + AStarResult res = se->aStar(goal, costFunc, dd); Vec2i goalPos = se->getGoalPos(); if (res != asrComplete || goalPos != dest) { return -1.f; diff --git a/source/glest_game/ai/route_planner.cpp b/source/glest_game/ai/route_planner.cpp index 5784747f..763b46d6 100644 --- a/source/glest_game/ai/route_planner.cpp +++ b/source/glest_game/ai/route_planner.cpp @@ -1,7 +1,7 @@ // ============================================================== // This file is part of Glest (www.glest.org) // -// Copyright (C) 2001-2008 Martiņo Figueroa +// Copyright (C) 2001-2008 Martio Figueroa // 2009-2010 James McCulloch // // You can redistribute this code and/or modify it under @@ -201,7 +201,8 @@ float RoutePlanner::quickSearch(Field field, int size, const Vec2i &start, const DiagonalDistance heuristic(dest); nsgSearchEngine->setStart(start, heuristic(start)); - AStarResult r = nsgSearchEngine->aStar(PosGoal(dest), moveCost, heuristic); + PosGoal goal(dest); + AStarResult r = nsgSearchEngine->aStar(goal, moveCost, heuristic); if (r == asrComplete && nsgSearchEngine->getGoalPos() == dest) { return nsgSearchEngine->getCostTo(dest); }