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

(svn r16442) -Codechange: use new Vehicle accessors at more places

Browse Source
This commit is contained in:
smatz
2009-05-26 22:45:48 +00:00
parent 0c53f04c07
commit e419fe6d3f
16 changed files with 127 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/station_cmd.cpp
View File

@@ -1547,11 +1547,9 @@ static CommandCost RemoveRoadStop(Station *st, DoCommandFlag flags, TileIndex ti
delete cur_stop;
/* Make sure no vehicle is going to the old roadstop */
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_ROAD &&
v->First() == v &&
v->current_order.IsType(OT_GOTO_STATION) &&
RoadVehicle *v;
FOR_ALL_ROADVEHICLES(v) {
if (v->First() == v && v->current_order.IsType(OT_GOTO_STATION) &&
v->dest_tile == tile) {
v->dest_tile = v->GetOrderStationLocation(st->index);
}
@@ -1964,11 +1962,9 @@ static CommandCost RemoveAirport(Station *st, DoCommandFlag flags)
CommandCost cost(EXPENSES_CONSTRUCTION, w * h * _price.remove_airport);
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (!(v->type == VEH_AIRCRAFT && IsNormalAircraft(v))) continue;
const Aircraft *a = (const Aircraft *)v;
const Aircraft *a;
FOR_ALL_AIRCRAFT(a) {
if (!IsNormalAircraft(a)) continue;
if (a->targetairport == st->index && a->state != FLYING) return CMD_ERROR;
}