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

Fix artic engines with no capacity on leading part in build window

Browse Source 
Engines were being shown as not having any capacity overall
This commit is contained in:
Jonathan G Rennison
2023-01-07 00:26:04 +00:00
parent e816c2416a
commit 9cff3666ae
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/build_vehicle_gui.cpp
View File

@@ -1085,6 +1085,7 @@ void TestedEngineDetails::FillDefaultCapacities(const Engine *e)
this->all_capacities[this->cargo] = this->capacity;
this->all_capacities[CT_MAIL] = this->mail_capacity;
}
if (this->all_capacities.GetCount() == 0) this->cargo = CT_INVALID;
}
/**
@@ -1521,7 +1522,7 @@ struct BuildVehicleWindow : BuildVehicleWindowBase {
if (this->sel_engine == INVALID_ENGINE) return;
const Engine *e = Engine::Get(this->sel_engine);
if (!e->CanCarryCargo()) {
if (!e->CanPossiblyCarryCargo()) {
this->te.cost = 0;
this->te.cargo = CT_INVALID;
this->te.all_capacities.Clear();
@@ -2377,7 +2378,7 @@ struct BuildVehicleWindowTrainAdvanced final : BuildVehicleWindowBase {
if (state.sel_engine == INVALID_ENGINE) return;
const Engine *e = Engine::Get(state.sel_engine);
if (!e->CanCarryCargo()) {
if (!e->CanPossiblyCarryCargo()) {
state.te.cost = 0;
state.te.cargo = CT_INVALID;
state.te.all_capacities.Clear();
@@ -2418,7 +2419,7 @@ struct BuildVehicleWindowTrainAdvanced final : BuildVehicleWindowBase {
}
/* Purchase test was not possible or failed, fill in the defaults instead. */
state.te.cost = 0;
state.te.cost = 0;
state.te.FillDefaultCapacities(e);
}