summaryrefslogtreecommitdiff
path: root/disaster_cmd.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-29 14:53:05 +0000
committertron <tron@openttd.org>2005-01-29 14:53:05 +0000
commitf2af1ed332f88f871d5e49d5e4732ad6ddfdf3ef (patch)
tree8d29f84df6fcdbd3fd221da9b4f1652900449cab /disaster_cmd.c
parentf08d102ac203b6072b5d1381d0a2c435dace731a (diff)
downloadopenttd-f2af1ed332f88f871d5e49d5e4732ad6ddfdf3ef.tar.xz
(svn r1716) Prevent zeppelins from accessing non-existent tiles when leaving the map
Diffstat (limited to 'disaster_cmd.c')
-rw-r--r--disaster_cmd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/disaster_cmd.c b/disaster_cmd.c
index e7d5f2393..bd3955a9c 100644
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -171,7 +171,8 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
} else if (v->current_order.station == 0) {
tile = v->tile; /**/
- if (IsTileType(tile, MP_STATION) &&
+ if (IsValidTile(tile) &&
+ IsTileType(tile, MP_STATION) &&
IS_BYTE_INSIDE(_map5[tile], 8, 0x43) &&
IS_HUMAN_PLAYER(_map_owner[tile])) {
@@ -196,7 +197,8 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
tile = v->tile; /**/
- if (IsTileType(tile, MP_STATION) &&
+ if (IsValidTile(tile) &&
+ IsTileType(tile, MP_STATION) &&
IS_BYTE_INSIDE(_map5[tile], 8, 0x43) &&
IS_HUMAN_PLAYER(_map_owner[tile])) {
@@ -238,7 +240,8 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
}
tile = v->tile;/**/
- if (IsTileType(tile, MP_STATION) &&
+ if (IsValidTile(tile) &&
+ IsTileType(tile, MP_STATION) &&
IS_BYTE_INSIDE(_map5[tile], 8, 0x43) &&
IS_HUMAN_PLAYER(_map_owner[tile])) {