summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-03-03 19:54:46 +0000
committertron <tron@openttd.org>2005-03-03 19:54:46 +0000
commit4099a8574346b205c785b2a36647b7888363e4b4 (patch)
treef0ea77598e2b4e1426e582ae234be1e66acb7623
parent098e83b3754dcc59b61f73ae7ee71689f76a6426 (diff)
downloadopenttd-4099a8574346b205c785b2a36647b7888363e4b4.tar.xz
(svn r1921) -Fix: Out of bounds array access which caused oil rigs to accept other cargo types besides passengers and mail
-rw-r--r--station_cmd.c4
-rw-r--r--variables.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/station_cmd.c b/station_cmd.c
index addb90a3e..b31069bf3 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -60,8 +60,8 @@ MemoryPool _roadstop_pool = { "RoadStop", ROADSTOP_POOL_MAX_BLOCKS, ROADSTOP_POO
// FIXME -- need to be embedded into Airport variable. Is dynamically
// deducteable from graphics-tile array, so will not be needed
-const byte _airport_size_x[5] = {4, 6, 1, 6, 7 };
-const byte _airport_size_y[5] = {3, 6, 1, 6, 7 };
+const byte _airport_size_x[] = {4, 6, 1, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+const byte _airport_size_y[] = {3, 6, 1, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
void ShowAircraftDepotWindow(uint tile);
extern void UpdateAirplanesOnNewStation(Station *st);
diff --git a/variables.h b/variables.h
index 07d23013c..1f7dbf587 100644
--- a/variables.h
+++ b/variables.h
@@ -427,8 +427,8 @@ extern const TileTypeProcs * const _tile_type_procs[16];
/* station_cmd.c */
// there are 5 types of airport (Country (3x4) , City(6x6), Metropolitan(6x6), International(7x7), Heliport(1x1)
// will become obsolete once airports are loaded from seperate file
-extern const byte _airport_size_x[5];
-extern const byte _airport_size_y[5];
+extern const byte _airport_size_x[];
+extern const byte _airport_size_y[];
/* misc */
VARDEF char _screenshot_name[128];