dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12588) -Codechange: do not access the destination of an order directly.

Browse Source
This commit is contained in:
rubidium
2008-04-06 07:48:51 +00:00
parent a3224512cc
commit 935b562074
18 changed files with 116 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ai/default/default.cpp
View File

@@ -263,8 +263,8 @@ static EngineID AiChooseAircraftToReplaceWith(const Player* p, const Vehicle* v)
FOR_VEHICLE_ORDERS(v, o) {
if (!o->IsValid()) continue;
if (!IsValidStationID(o->dest)) continue;
const Station *st = GetStation(o->dest);
if (!IsValidStationID(o->GetDestination())) continue;
const Station *st = GetStation(o->GetDestination());
if (!(st->facilities & FACIL_AIRPORT)) continue;
AirportFTAClass::Flags flags = st->Airport()->flags;
@@ -3662,7 +3662,7 @@ static void AiStateRemoveStation(Player *p)
byte *in_use = MallocT<byte>(GetMaxStationIndex() + 1);
memset(in_use, 0, GetMaxStationIndex() + 1);
FOR_ALL_ORDERS(ord) {
if (ord->IsType(OT_GOTO_STATION)) in_use[ord->dest] = 1;
if (ord->IsType(OT_GOTO_STATION)) in_use[ord->GetDestination()] = 1;
}
// Go through all stations and delete those that aren't in use