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

Add whether the vehicle is non-front to the vehicle pool pointer tag

Browse Source 
Add iteration filters which check this
This commit is contained in:
Jonathan G Rennison
2024-02-25 14:49:31 +00:00
parent 05e237f8d1
commit 93bf033107
23 changed files with 145 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehiclelist.cpp
View File

@@ -155,7 +155,7 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli
};
auto fill_all_vehicles = [&]() {
for (const Vehicle *v : Vehicle::IterateType(vli.vtype)) {
for (const Vehicle *v : Vehicle::IterateTypeFrontOnly(vli.vtype)) {
if (!HasBit(v->subtype, GVSF_VIRTUAL) && v->owner == vli.company && v->IsPrimaryVehicle()) {
add_veh(v);
}
@@ -184,7 +184,7 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli
case VL_GROUP_LIST:
if (vli.index != ALL_GROUP) {
for (const Vehicle *v : Vehicle::IterateType(vli.vtype)) {
for (const Vehicle *v : Vehicle::IterateTypeFrontOnly(vli.vtype)) {
if (!HasBit(v->subtype, GVSF_VIRTUAL) && v->IsPrimaryVehicle() &&
v->owner == vli.company && GroupIsInGroup(v->group_id, vli.index)) {
add_veh(v);