Mercurial > hg > openttd
changeset 5921:9d251365258e draft
(svn r8549) -Fix
Do not check whether the end of the depot array has been reached when building an aircraft. This cannot happen, just assert it really does not happen
author | tron <tron@openttd.org> |
---|---|
date | Sat, 03 Feb 2007 08:30:22 +0000 |
parents | 944cc709024f |
children | 2ab303172d09 |
files | src/aircraft_cmd.cpp |
diffstat | 1 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -338,24 +338,17 @@ _new_vehicle_id = v->index; - v->u.air.pos = MAX_ELEMENTS; - /* When we click on hangar we know the tile it is on. By that we know * its position in the array of depots the airport has.....we can search * layout for #th position of depot. Since layout must start with a listing * of all depots, it is simple */ - { - uint i; - - for (i = 0; i < apc->nof_depots; i++) { - if (st->airport_tile + ToTileIndexDiff(apc->airport_depots[i]) == tile) { - assert(apc->layout[i].heading == HANGAR); - v->u.air.pos = apc->layout[i].position; - break; - } + for (uint i = 0;; i++) { + assert(i != apc->nof_depots); + if (st->airport_tile + ToTileIndexDiff(apc->airport_depots[i]) == tile) { + assert(apc->layout[i].heading == HANGAR); + v->u.air.pos = apc->layout[i].position; + break; } - // to ensure v->u.air.pos has been given a value - assert(v->u.air.pos != MAX_ELEMENTS); } v->u.air.state = HANGAR;