(svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler...
--- a/src/economy.cpp Fri Jun 22 22:25:21 2007 +0000
+++ b/src/economy.cpp Fri Jun 22 22:28:15 2007 +0000
@@ -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 Fri Jun 22 22:25:21 2007 +0000
+++ b/src/roadveh_cmd.cpp Fri Jun 22 22:28:15 2007 +0000
@@ -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 Fri Jun 22 22:25:21 2007 +0000
+++ b/src/train_cmd.cpp Fri Jun 22 22:28:15 2007 +0000
@@ -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;
}