--- a/src/map.cpp	Mon Nov 19 21:32:20 2007 +0000
+++ b/src/map.cpp	Tue Nov 20 12:57:24 2007 +0000
@@ -218,7 +218,7 @@
 {
 	const uint dx = delta(TileX(t0), TileX(t1));
 	const uint dy = delta(TileY(t0), TileY(t1));
-	return dx > dy ? dx : dy;
+	return max(dx, dy);
 }
 
 
@@ -248,9 +248,9 @@
 	const uint yl = TileY(tile);
 	const uint xh = MapSizeX() - 1 - xl;
 	const uint yh = MapSizeY() - 1 - yl;
-	const uint minl = xl < yl ? xl : yl;
-	const uint minh = xh < yh ? xh : yh;
-	return minl < minh ? minl : minh;
+	const uint minl = min(xl, yl);
+	const uint minh = min(xh, yh);
+	return min(minl, minh);
 }
 
 /*!