(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().

1 files changed, 2 insertions, 2 deletions

diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index 58ff9291f..bc63a8523 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -234,13 +234,13 @@ static void GetAcceptedCargo_Unmovable(TileIndex tile, AcceptedCargo ac)
 
 	// Top town building generates 10, so to make HQ interesting, the top
 	// type makes 20.
-	ac[CT_PASSENGERS] = max(1, level);
+	ac[CT_PASSENGERS] = max(1U, level);
 
 	// Top town building generates 4, HQ can make up to 8. The
 	// proportion passengers:mail is different because such a huge
 	// commercial building generates unusually high amount of mail
 	// correspondence per physical visitor.
-	ac[CT_MAIL] = max(1, level / 2);
+	ac[CT_MAIL] = max(1U, level / 2);
 }