Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Departures: Move show pax/freight parameter to calling settings

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-09-04 20:54:20 +01:00
parent 67bc20a9a9
commit 41f4377fe9
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/departures.cpp
View File

@ -265,11 +265,9 @@ static void ScheduledDispatchDepartureLocalFix(DepartureList &departure_list)
* @param vehicles set of all the vehicles stopping at this station, of all vehicles types that we are interested in
* @param type the type of departures to get (departures or arrivals)
* @param calling_settings departure calling settings
* @param show_pax whether to include passenger vehicles
* @param show_freight whether to include freight vehicles
* @return a list of departures, which is empty if an error occurred
*/
DepartureList MakeDepartureList(StationID station, const std::vector<const Vehicle *> &vehicles, DepartureType type, DepartureCallingSettings calling_settings, bool show_pax, bool show_freight)
DepartureList MakeDepartureList(StationID station, const std::vector<const Vehicle *> &vehicles, DepartureType type, DepartureCallingSettings calling_settings)
{
/* This function is the meat of the departure boards functionality. */
/* As an overview, it works by repeatedly considering the best possible next departure to show. */
@ -278,7 +276,7 @@ DepartureList MakeDepartureList(StationID station, const std::vector<const Vehic
/* This code can probably be made more efficient. I haven't done so in order to keep both its (relative) simplicity and my (relative) sanity. */
/* Having written that, it's not exactly slow at the moment. */
if (!show_pax && !show_freight) return {};
if (!calling_settings.show_pax && !calling_settings.show_freight) return {};
/* The list of departures which will be returned as a result. */
std::vector<std::unique_ptr<Departure>> result;
@ -302,7 +300,7 @@ DepartureList MakeDepartureList(StationID station, const std::vector<const Vehic
/* We find the least order while we're at it. */
for (const Vehicle *v : vehicles) {
if (v->GetNumOrders() == 0) continue;
if (show_pax != show_freight) {
if (calling_settings.show_pax != calling_settings.show_freight) {
bool carries_passengers = false;
const Vehicle *u = v;
@ -314,7 +312,7 @@ DepartureList MakeDepartureList(StationID station, const std::vector<const Vehic
u = u->Next();
}
if (carries_passengers != show_pax) {
if (carries_passengers != calling_settings.show_pax) {
continue;
}
}

3
src/departures_func.h
View File

@ -17,8 +17,7 @@
#include <vector>
DepartureList MakeDepartureList(StationID station, const std::vector<const Vehicle *> &vehicles, DepartureType type,
DepartureCallingSettings calling_settings, bool show_pax = true, bool show_freight = true);
DepartureList MakeDepartureList(StationID station, const std::vector<const Vehicle *> &vehicles, DepartureType type, DepartureCallingSettings calling_settings);
Ticks GetDeparturesMaxTicksAhead();

6
src/departures_gui.cpp
View File

@ -486,14 +486,16 @@ public:
settings.allow_via = this->is_waypoint || this->show_via;
settings.departure_no_load_test = this->is_waypoint || _settings_client.gui.departure_show_all_stops;
settings.show_all_stops = _settings_client.gui.departure_show_all_stops;
settings.show_pax = show_pax;
settings.show_freight = show_freight;
if (this->mode != DM_ARRIVALS) {
this->departures = MakeDepartureList(this->station, this->vehicles, D_DEPARTURE, settings, show_pax, show_freight);
this->departures = MakeDepartureList(this->station, this->vehicles, D_DEPARTURE, settings);
} else {
this->departures.clear();
}
if (this->mode == DM_ARRIVALS || this->mode == DM_SEPARATE) {
this->arrivals = MakeDepartureList(this->station, this->vehicles, D_ARRIVAL, settings, show_pax, show_freight);
this->arrivals = MakeDepartureList(this->station, this->vehicles, D_ARRIVAL, settings);
} else {
this->arrivals.clear();
}

2
src/departures_type.h
View File

@ -117,6 +117,8 @@ struct DepartureCallingSettings {
bool allow_via = false;
bool departure_no_load_test = false;
bool show_all_stops = false;
bool show_pax = false;
bool show_freight = false;
bool IsDeparture(const Order *order, StationID station);
bool IsArrival(const Order *order, StationID station);