From f7c3a895f03520d80e3c50cf5de94c3ca8fbc4a7 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 17 Apr 2007 11:40:49 +0000
Subject: [PATCH] Fixed Astar algo

---
 src/ei/game/algo/AStar.java       | 2 --
 src/ei/game/algo/AStarNode2D.java | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ei/game/algo/AStar.java b/src/ei/game/algo/AStar.java
index d5fd510..5dee3e1 100644
--- a/src/ei/game/algo/AStar.java
+++ b/src/ei/game/algo/AStar.java
@@ -32,8 +32,6 @@ public class AStar{
 	
 	protected void initializePathfinder() {
 		System.out.println("Initializing pathfinder");
-
-		AStarNode2D.heuristic = Heuristic.Euclidean;
 		
 		// Create the pathfinder.
 		pathfinder = new AStarPathfinder();
diff --git a/src/ei/game/algo/AStarNode2D.java b/src/ei/game/algo/AStarNode2D.java
index 0928c05..e445453 100644
--- a/src/ei/game/algo/AStarNode2D.java
+++ b/src/ei/game/algo/AStarNode2D.java
@@ -9,7 +9,7 @@ import ei.game.algo.AStarNeighbour.Location;
  */
 public class AStarNode2D extends AStarNode {
 	protected final static float adjacentCost = 1;
-	protected final static float diagonalCost = (float)Math.sqrt(2)*adjacentCost;
+	protected final static float diagonalCost = (float)Math.sqrt(2)*adjacentCost+1;
 	protected final static float tieBreaker = adjacentCost/(1024f/1024f); 
 	 
 	public enum Heuristic {
@@ -20,7 +20,7 @@ public class AStarNode2D extends AStarNode {
 		DiagonalWithTieBreakingCrossProduct,
 	}
 	
-	public static Heuristic heuristic = Heuristic.Manhattan;
+	public static Heuristic heuristic = Heuristic.Euclidean;
 	
 	protected int x, y;