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

Fix freight weight multiplier not being applied in train build window

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-01-07 12:59:09 +00:00
parent 9cff3666ae
commit d3e1c2695e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/build_vehicle_gui.cpp
View File

@@ -755,11 +755,17 @@ static GUIEngineList::FilterFunction * const _filter_funcs[] = {
&CargoAndEngineFilter, &CargoAndEngineFilter,
}; };
static uint GetCargoWeight(const CargoArray &cap) static uint GetCargoWeight(const CargoArray &cap, VehicleType vtype)
{ {
uint weight = 0; uint weight = 0;
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoID c = 0; c < NUM_CARGO; c++) {
if (cap[c] != 0) weight += CargoSpec::Get(c)->weight * cap[c] / 16; if (cap[c] != 0) {
if (vtype == VEH_TRAIN) {
weight += CargoSpec::Get(c)->WeightOfNUnitsInTrain(cap[c]);
} else {
weight += CargoSpec::Get(c)->WeightOfNUnits(cap[c]);
}
}
} }
return weight; return weight;
} }
@@ -798,7 +804,7 @@ static int DrawRailWagonPurchaseInfo(int left, int right, int y, EngineID engine
/* Wagon weight - (including cargo) */ /* Wagon weight - (including cargo) */
uint weight = e->GetDisplayWeight(); uint weight = e->GetDisplayWeight();
SetDParam(0, weight); SetDParam(0, weight);
SetDParam(1, GetCargoWeight(te.all_capacities) + weight); SetDParam(1, GetCargoWeight(te.all_capacities, VEH_TRAIN) + weight);
DrawString(left, right, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT); DrawString(left, right, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT);
y += FONT_HEIGHT_NORMAL; y += FONT_HEIGHT_NORMAL;
@@ -891,7 +897,7 @@ static int DrawRoadVehPurchaseInfo(int left, int right, int y, EngineID engine_n
/* Road vehicle weight - (including cargo) */ /* Road vehicle weight - (including cargo) */
int16 weight = e->GetDisplayWeight(); int16 weight = e->GetDisplayWeight();
SetDParam(0, weight); SetDParam(0, weight);
SetDParam(1, GetCargoWeight(te.all_capacities) + weight); SetDParam(1, GetCargoWeight(te.all_capacities, VEH_ROAD) + weight);
DrawString(left, right, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT); DrawString(left, right, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT);
y += FONT_HEIGHT_NORMAL; y += FONT_HEIGHT_NORMAL;