mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13232) -Codechange: Simplify BuildDepotVehicleList()

release/0.7
peter1138 2008-05-24 12:12:02 +00:00
parent 68bb5a08c5
commit c34b458ace
1 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/vehicle.cpp
View File

@ -1333,8 +1333,6 @@ static inline void ExtendVehicleListSize(const Vehicle ***engine_list, uint16 *e
*/ */
void BuildDepotVehicleList(VehicleType type, TileIndex tile, Vehicle ***engine_list, uint16 *engine_list_length, uint16 *engine_count, Vehicle ***wagon_list, uint16 *wagon_list_length, uint16 *wagon_count) void BuildDepotVehicleList(VehicleType type, TileIndex tile, Vehicle ***engine_list, uint16 *engine_list_length, uint16 *engine_count, Vehicle ***wagon_list, uint16 *wagon_list_length, uint16 *wagon_count)
{ {
Vehicle *v;
/* This function should never be called without an array to store results */ /* This function should never be called without an array to store results */
assert(!(engine_list == NULL && type != VEH_TRAIN)); assert(!(engine_list == NULL && type != VEH_TRAIN));
assert(!(type == VEH_TRAIN && engine_list == NULL && wagon_list == NULL)); assert(!(type == VEH_TRAIN && engine_list == NULL && wagon_list == NULL));
@ -1349,53 +1347,31 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, Vehicle ***engine_l
if (engine_count != NULL) *engine_count = 0; if (engine_count != NULL) *engine_count = 0;
if (wagon_count != NULL) *wagon_count = 0; if (wagon_count != NULL) *wagon_count = 0;
switch (type) { Vehicle *v;
case VEH_TRAIN: FOR_ALL_VEHICLES(v) {
FOR_ALL_VEHICLES(v) { /* General tests for all vehicle types */
if (v->tile == tile && v->type == VEH_TRAIN && v->u.rail.track == TRACK_BIT_DEPOT) { if (v->type != type) continue;
if (IsFrontEngine(v)) { if (v->tile != tile) continue;
if (engine_list == NULL) continue;
if (*engine_count == *engine_list_length) ExtendVehicleListSize((const Vehicle***)engine_list, engine_list_length, 25);
(*engine_list)[(*engine_count)++] = v;
} else if (IsFreeWagon(v)) {
if (wagon_list == NULL) continue;
if (*wagon_count == *wagon_list_length) ExtendVehicleListSize((const Vehicle***)wagon_list, wagon_list_length, 25);
(*wagon_list)[(*wagon_count)++] = v;
}
}
}
break;
case VEH_ROAD: switch (type) {
FOR_ALL_VEHICLES(v) { case VEH_TRAIN:
if (v->tile == tile && v->type == VEH_ROAD && v->IsInDepot() && IsRoadVehFront(v)) { if (v->u.rail.track != TRACK_BIT_DEPOT) continue;
if (*engine_count == *engine_list_length) ExtendVehicleListSize((const Vehicle***)engine_list, engine_list_length, 25); if (wagon_list != NULL && IsFreeWagon(v)) {
(*engine_list)[(*engine_count)++] = v; if (*wagon_count == *wagon_list_length) ExtendVehicleListSize((const Vehicle***)wagon_list, wagon_list_length, 25);
(*wagon_list)[(*wagon_count)++] = v;
continue;
} }
} break;
break;
case VEH_SHIP: default:
FOR_ALL_VEHICLES(v) { if (!v->IsInDepot()) continue;
if (v->tile == tile && v->type == VEH_SHIP && v->IsInDepot()) { break;
if (*engine_count == *engine_list_length) ExtendVehicleListSize((const Vehicle***)engine_list, engine_list_length, 25); }
(*engine_list)[(*engine_count)++] = v;
}
}
break;
case VEH_AIRCRAFT: if (!v->IsPrimaryVehicle()) continue;
FOR_ALL_VEHICLES(v) {
if (v->tile == tile &&
v->type == VEH_AIRCRAFT && IsNormalAircraft(v) &&
v->IsInDepot()) {
if (*engine_count == *engine_list_length) ExtendVehicleListSize((const Vehicle***)engine_list, engine_list_length, 25);
(*engine_list)[(*engine_count)++] = v;
}
}
break;
default: NOT_REACHED(); if (*engine_count == *engine_list_length) ExtendVehicleListSize((const Vehicle***)engine_list, engine_list_length, 25);
(*engine_list)[(*engine_count)++] = v;
} }
} }