cpp/openttd-patchpack/source Changeset - r27919:cd30b76e8b60

Changeset - r27919:cd30b76e8b60

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 15 months ago 2023-09-15 19:22:58
truebrain@openttd.org

Fix: also apply cargo filters on shared groups in vehicle listing (#11294)

1 file changed with 26 insertions and 10 deletions:

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -196,14 +196,12 @@ void BaseVehicleListWindow::BuildVehicle @@
 		for (auto it = this->vehicles.begin(); it != this->vehicles.end(); ++it) {
 			this->vehgroups.emplace_back(it, it + 1);
 			max_unitnumber = std::max<uint>(max_unitnumber, (*it)->unitnumber);
+		}
 		this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber);
 		this->FilterVehicleList();
 	} else {
 		/* Sort by the primary vehicle; we just want all vehicles that share the same orders to form a contiguous range. */
 		std::stable_sort(this->vehicles.begin(), this->vehicles.end(), [](const Vehicle * const &u, const Vehicle * const &v) {
 			return u->FirstShared() < v->FirstShared();
 		});
@@ @@ -221,28 +219,27 @@ void BaseVehicleListWindow::BuildVehicle @@
 			begin = end;
+		}
 		this->unitnumber_digits = CountDigitsForAllocatingSpace(max_num_vehicles);
+	}
 	this->FilterVehicleList();
 	this->vehgroups.RebuildDone();
 	this->vscroll->SetCount(this->vehgroups.size());
+}
 /** Cargo filter functions */
 /**
  * Check whether a vehicle can carry a specific cargo.
  * @param vehgroup The vehicle group which contains the vehicle to be checked
  * @param cid The cargo what we are looking for
  * @return Whether the vehicle can carry the specified cargo or not
  * Check whether a single vehicle should pass the filter.
+ *
  * @param v The vehicle to check.
  * @param cid The cargo to filter for.
  * @return true iff the vehicle carries the cargo.
  */
-static bool CDECL CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid)
+static bool CargoFilterSingle(const Vehicle *v, const CargoID cid)
+{
 	const Vehicle *v = (*vehgroup).GetSingleVehicle();
 	if (cid == BaseVehicleListWindow::CF_ANY) {
 		return true;
 	} else if (cid == BaseVehicleListWindow::CF_NONE) {
 		for (const Vehicle *w = v; w != nullptr; w = w->Next()) {
 			if (w->cargo_cap > 0) {
 				return false;
@@ @@ -268,12 +265,31 @@ static bool CDECL CargoFilter(const GUIV @@
+			}
+		}
 		return false;
+	}
+}
 /**
  * Check whether a vehicle can carry a specific cargo.
+ *
  * @param vehgroup The vehicle group which contains the vehicle to be checked
  * @param cid The cargo what we are looking for
  * @return Whether the vehicle can carry the specified cargo or not
  */
 static bool CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid)
+{
 	auto it = vehgroup->vehicles_begin;
 	/* Check if any vehicle in the group matches; if so, the whole group does. */
 	for (; it != vehgroup->vehicles_end; it++) {
 		if (CargoFilterSingle(*it, cid)) return true;
+	}
 	return false;
+}
 static GUIVehicleGroupList::FilterFunction * const _filter_funcs[] = {
 	&CargoFilter,
 };
 /**
  * Set cargo filter list item index.

0 comments (0 inline, 0 general)