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

Codechange: Iterate group vehicle lists for WhoCanServiceIndustry

pull/10548/head
SamuXarick 2023-12-30 21:37:34 +00:00
parent e1f07a56ee
commit becb273ed4
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/industry_cmd.cpp
View File

@ -2684,40 +2684,39 @@ int WhoCanServiceIndustry(Industry *ind)
if (ind->stations_near.empty()) return 0; // No stations found at all => nobody services if (ind->stations_near.empty()) return 0; // No stations found at all => nobody services
int result = 0; int result = 0;
for (const Vehicle *v : Vehicle::Iterate()) { for (const Company *c : Company::Iterate()) {
/* Is it worthwhile to try this vehicle? */ for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
if (v->owner != _local_company && result != 0) continue; const VehicleList &vehicle_list = c->group_all[type].vehicle_list;
for (const Vehicle *v : vehicle_list) {
/* Is it worthwhile to try this vehicle? */
if (v->owner != _local_company && result != 0) continue;
/* Check whether it accepts the right kind of cargo */ /* Check whether it accepts the right kind of cargo */
bool c_accepts = false; bool c_accepts = false;
bool c_produces = false; bool c_produces = false;
if (v->type == VEH_TRAIN && v->IsFrontEngine()) { for (const Vehicle *u = v; u != nullptr; u = u->Next()) {
for (const Vehicle *u = v; u != nullptr; u = u->Next()) { CanCargoServiceIndustry(u->cargo_type, ind, &c_accepts, &c_produces);
CanCargoServiceIndustry(u->cargo_type, ind, &c_accepts, &c_produces); }
} if (!c_accepts && !c_produces) continue; // Wrong cargo
} else if (v->type == VEH_ROAD || v->type == VEH_SHIP || v->type == VEH_AIRCRAFT) {
CanCargoServiceIndustry(v->cargo_type, ind, &c_accepts, &c_produces);
} else {
continue;
}
if (!c_accepts && !c_produces) continue; // Wrong cargo
/* Check orders of the vehicle. /* Check orders of the vehicle.
* We cannot check the first of shared orders only, since the first vehicle in such a chain * We cannot check the first of shared orders only, since the first vehicle in such a chain
* may have a different cargo type. * may have a different cargo type.
*/ */
for (const Order *o : v->Orders()) { for (const Order *o : v->Orders()) {
if (o->IsType(OT_GOTO_STATION) && !(o->GetUnloadType() & OUFB_TRANSFER)) { if (o->IsType(OT_GOTO_STATION) && !(o->GetUnloadType() & OUFB_TRANSFER)) {
/* Vehicle visits a station to load or unload */ /* Vehicle visits a station to load or unload */
Station *st = Station::Get(o->GetDestination()); Station *st = Station::Get(o->GetDestination());
assert(st != nullptr); assert(st != nullptr);
/* Same cargo produced by industry is dropped here => not serviced by vehicle v */ /* Same cargo produced by industry is dropped here => not serviced by vehicle v */
if ((o->GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break; if ((o->GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
if (ind->stations_near.find(st) != ind->stations_near.end()) { if (ind->stations_near.find(st) != ind->stations_near.end()) {
if (v->owner == _local_company) return 2; // Company services industry if (v->owner == _local_company) return 2; // Company services industry
result = 1; // Competitor services industry result = 1; // Competitor services industry
}
}
} }
} }
} }