Index: ai/interface.hpp
===================================================================
--- ai/interface.hpp	(revision 53725)
+++ ai/interface.hpp	(working copy)
@@ -47,7 +47,7 @@
 	virtual void play_turn() = 0;
 
 	/**
-	 * Function called when a a new turn is played
+	 * Function called when a new turn is played
 	 */
 	virtual void new_turn() = 0;
 
===================================================================
--- map_location.cpp	(revision 53725)
+++ map_location.cpp	(working copy)
@@ -304,26 +303,26 @@
 
 void get_adjacent_tiles(const map_location& a, map_location* res)
 {
-	res->x = a.x;
-	res->y = a.y-1;
-	++res;
-	res->x = a.x+1;
-	res->y = a.y - (is_even(a.x) ? 1:0);
-	++res;
-	res->x = a.x+1;
-	res->y = a.y + (is_odd(a.x) ? 1:0);
-	++res;
-	res->x = a.x;
-	res->y = a.y+1;
-	++res;
-	res->x = a.x-1;
-	res->y = a.y + (is_odd(a.x) ? 1:0);
-	++res;
-	res->x = a.x-1;
-	res->y = a.y - (is_even(a.x) ? 1:0);
+  bool parity = is_even(a.x);
+  res->x = a.x;
+  res->y = a.y-1;
+  ++res;
+  res->x = a.x+1;
+  res->y = a.y - parity;
+  ++res;
+  res->x = a.x+1;
+  res->y = a.y + !parity;
+  ++res;
+  res->x = a.x;
+  res->y = a.y+1;
+  ++res;
+  res->x = a.x-1;
+  res->y = a.y + !parity;
+  ++res;
+  res->x = a.x-1;
+  res->y = a.y - parity;
 }