Mercurial > hg > openttd

changeset 7023:1997a5b53cec draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler...
author rubidium <rubidium@openttd.org>
date Fri, 22 Jun 2007 22:28:15 +0000
parents 1e16b426bc5a
children ffcf8db1b498
files src/economy.cpp src/roadveh_cmd.cpp src/train_cmd.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1586,7 +1586,7 @@
 			if (_patches.gradual_loading) cap = min(cap, load_amount);
 			if (_patches.improved_load) {
 				/* Don't load stuff that is already 'reserved' for other vehicles */
-				cap = min(cargo_left[v->cargo_type], cap);
+				cap = min((uint)cargo_left[v->cargo_type], cap);
 				cargo_left[v->cargo_type] -= cap;
 			}
 
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -97,7 +97,7 @@
 	}
 
 	image = direction + _roadveh_images[img];
-	if (v->cargo.Count() >= v->cargo_cap / 2) image += _roadveh_full_adder[img];
+	if (v->cargo.Count() >= v->cargo_cap / 2U) image += _roadveh_full_adder[img];
 	return image;
 }
 
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -463,7 +463,7 @@
 
 	base = _engine_sprite_base[img] + ((direction + _engine_sprite_add[img]) & _engine_sprite_and[img]);
 
-	if (v->cargo.Count() >= v->cargo_cap / 2) base += _wagon_full_adder[img];
+	if (v->cargo.Count() >= v->cargo_cap / 2U) base += _wagon_full_adder[img];
 	return base;
 }