diff options
author | celestar <celestar@openttd.org> | 2007-01-11 11:05:01 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2007-01-11 11:05:01 +0000 |
commit | 2ac0410767683fb0e6315433f9805712cb85f5bd (patch) | |
tree | f9cb6bcd0d0b855706d1e00e0a4ffd2757c7e039 /src/newgrf_engine.cpp | |
parent | 7996c9e560f61cddba0a3ad48b95c81d9030ef99 (diff) | |
download | openttd-2ac0410767683fb0e6315433f9805712cb85f5bd.tar.xz |
(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().
Diffstat (limited to 'src/newgrf_engine.cpp')
-rw-r--r-- | src/newgrf_engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 5b0fa5179..58f1e43b6 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -832,7 +832,7 @@ static const SpriteGroup *VehicleResolveReal(const ResolverObject *object, const } else if (v->cargo_count == 0 || totalsets == 2) { set = 0; } else { - set = v->cargo_count * (totalsets - 2) / max(1, v->cargo_cap) + 1; + set = v->cargo_count * (totalsets - 2) / max((uint16)1, v->cargo_cap) + 1; } return in_motion ? group->g.real.loaded[set] : group->g.real.loading[set]; |