diff options
| author | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
| commit | 0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c (patch) | |
| tree | 172ef15bca6626b797fbf586a043a978ee884141 /aircraft_gui.c | |
| parent | 19e2b40a788cc175f35e4ca0cec0f439bd46ab76 (diff) | |
| download | openttd-0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c.tar.xz | |
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
Diffstat (limited to 'aircraft_gui.c')
| -rw-r--r-- | aircraft_gui.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/aircraft_gui.c b/aircraft_gui.c index f15485762..7cf0cf903 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -199,7 +199,7 @@ static void ShowBuildAircraftWindow(uint tile) w->resize.step_height = 24; if (tile != 0) { - w->caption_color = _map_owner[tile]; + w->caption_color = GetTileOwner(tile); } else { w->caption_color = _local_player; } @@ -612,7 +612,8 @@ static void DrawAircraftDepotWindow(Window *w) tile = w->window_number; /* setup disabled buttons */ - w->disabled_state = (_map_owner[tile]==_local_player) ? 0 : ((1<<4)|(1<<7)); + w->disabled_state = + IsTileOwner(tile, _local_player) ? 0 : ((1 << 4) | (1 << 7)); /* determine amount of items for scroller */ num = 0; @@ -828,7 +829,7 @@ void ShowAircraftDepotWindow(uint tile) w = AllocateWindowDescFront(&_aircraft_depot_desc, tile); if (w) { - w->caption_color = _map_owner[tile]; + w->caption_color = GetTileOwner(tile); w->vscroll.cap = 2; w->hscroll.cap = 4; w->resize.step_width = 74; @@ -1013,7 +1014,7 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e) tile = _last_built_aircraft_depot_tile; do { - if (_map_owner[tile] == _local_player && IsAircraftHangarTile(tile)) { + if (IsTileOwner(tile, _local_player) && IsAircraftHangarTile(tile)) { ShowAircraftDepotWindow(tile); ShowBuildAircraftWindow(tile); return; |