summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-02-16 00:10:03 +0000
committerglx <glx@openttd.org>2008-02-16 00:10:03 +0000
commit044ca2bbf63f7162cdceaf535957fd1443f80ea4 (patch)
treef83c2c28c5c30ee5dbd7546cd241363a454ad7bf
parent3e70ee6ed7ea7bfb7b08ee70206a30651aec956b (diff)
downloadopenttd-044ca2bbf63f7162cdceaf535957fd1443f80ea4.tar.xz
(svn r12155) -Fix (r12154): some warnings (always compile before commit)
-rw-r--r--src/ai/default/default.cpp2
-rw-r--r--src/airport_gui.cpp2
-rw-r--r--src/station_cmd.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index 949f29702..0c81cee23 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -3409,7 +3409,7 @@ static bool AiCheckAirportResources(TileIndex tile, const AiDefaultBlockData *p,
const AirportFTAClass* airport = GetAirport(p->attr);
uint w = airport->size_x;
uint h = airport->size_y;
- uint rad = _patches.modified_catchment ? airport->catchment : CA_UNMODIFIED;
+ uint rad = _patches.modified_catchment ? airport->catchment : (uint)CA_UNMODIFIED;
if (cargo & 0x80) {
GetProductionAroundTiles(values, tile2, w, h, rad);
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index e0b5bb7db..95cfa12da 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -179,7 +179,7 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
airport = GetAirport(_selected_airport_type);
SetTileSelectSize(airport->size_x, airport->size_y);
- int rad = _patches.modified_catchment ? airport->catchment : CA_UNMODIFIED;
+ int rad = _patches.modified_catchment ? airport->catchment : (uint)CA_UNMODIFIED;
if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 77e3ad8f3..8178b9e7f 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -599,7 +599,7 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
TileXY(rect.min_x, rect.min_y),
rect.max_x - rect.min_x + 1,
rect.max_y - rect.min_y + 1,
- _patches.modified_catchment ? FindCatchmentRadius(st) : CA_UNMODIFIED
+ _patches.modified_catchment ? FindCatchmentRadius(st) : (uint)CA_UNMODIFIED
);
} else {
memset(accepts, 0, sizeof(accepts));