From 08de6b082af59087361b5d7e5be67b6e3cd66a82 Mon Sep 17 00:00:00 2001 From: celestar Date: Thu, 11 Jan 2007 11:05:01 +0000 Subject: (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/aircraft_cmd.cpp') diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 16c4edfab..b694d7247 100644 --- a/src/aircraft_cmd.cpp +++ b/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; -- cgit v1.2.3-70-g09d2