(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().

src/aircraft_cmd.cpp

@@ -1066,7 +1066,7 @@ static bool AircraftController(Vehicle *v)
 		if (curz > z) {
 			z++;
 		} else {
-			int t = max(1, dist - 4);
+			int t = max(1U, dist - 4);
 
 			z -= ((z - curz) + t - 1) / t;
 			if (z < curz) z = curz;