diff options
author | rubidium <rubidium@openttd.org> | 2007-06-22 22:28:15 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-06-22 22:28:15 +0000 |
commit | 117368a5a991f5dc64c60e442f3b611f27347cc7 (patch) | |
tree | d9b82a1bf63a9b8278fda19af4a3809c477b5544 | |
parent | 8d415469ccd1d97de12c072bddd4a2397c68f36a (diff) | |
download | openttd-117368a5a991f5dc64c60e442f3b611f27347cc7.tar.xz |
(svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler...
-rw-r--r-- | src/economy.cpp | 2 | ||||
-rw-r--r-- | src/roadveh_cmd.cpp | 2 | ||||
-rw-r--r-- | src/train_cmd.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 2f12a070e..9fbfee677 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1586,7 +1586,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) 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; } diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 0ed011ce7..fc7873deb 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -97,7 +97,7 @@ int GetRoadVehImage(const Vehicle* v, Direction direction) } 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; } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index d2a12e2c0..2fbe463e3 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -463,7 +463,7 @@ int GetTrainImage(const Vehicle* v, Direction direction) 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; } |