(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/graph_gui.cpp b/src/graph_gui.cpp
index 96d0f9f7a..3528e71e0 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -119,7 +119,7 @@ static void DrawGraph(const GraphDrawer *gw)
 			col_ptr = row_ptr;
 			do {
 				if (*col_ptr != INVALID_VALUE) {
-					mx = max64(mx, *col_ptr);
+					mx = max((uint64)mx, *col_ptr);
 				}
 			} while (col_ptr++, --num_x);
 		}
@@ -306,7 +306,7 @@ static void SetupGraphDrawerForPlayers(GraphDrawer *gd)
 {
 	const Player* p;
 	uint excludebits = _legend_excludebits;
-	int nums;
+	byte nums;
 	int mo,yr;
 
 	// Exclude the players which aren't valid