diff options
| author | frosch <frosch@openttd.org> | 2008-10-25 22:00:51 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-10-25 22:00:51 +0000 |
| commit | 896841403f85fef9c2648ac15b239248f05b59e0 (patch) | |
| tree | 278c186d495c24d145ab5754fb4d0214701a4bcc | |
| parent | 77a5a4953baa805fdbf77711bf4a064be86c26b8 (diff) | |
| download | openttd-896841403f85fef9c2648ac15b239248f05b59e0.tar.xz | |
(svn r14536) -Fix (r14530): Do not expect uints to become negative.
| -rw-r--r-- | src/economy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 25a635602..f933c80cb 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1298,12 +1298,12 @@ static void DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, int nu if (st->rect.IsEmpty()) return; /* Compute acceptance rectangle */ - uint catchment_radius = st->GetCatchmentRadius(); + int catchment_radius = st->GetCatchmentRadius(); Rect rect = { - max(st->rect.left - catchment_radius, 0u), - max(st->rect.top - catchment_radius, 0u), - min(st->rect.right + catchment_radius, MapMaxX()), - min(st->rect.bottom + catchment_radius, MapMaxY()) + max<int>(st->rect.left - catchment_radius, 0), + max<int>(st->rect.top - catchment_radius, 0), + min<int>(st->rect.right + catchment_radius, MapMaxX()), + min<int>(st->rect.bottom + catchment_radius, MapMaxY()) }; /* Compute maximum extent of acceptance rectangle wrt. station sign */ |