From bc5681e79f238a65782a5a6b7c2d9ab2719d176b Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 26 May 2019 18:53:33 +0100 Subject: [PATCH] Fix incorrect cargo IDs used in load by cargo type GUI Use CargoSpec::Index instead of GetCargoIDByBitnum --- src/order_gui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 10564a79ef..fd85c50774 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -113,7 +113,7 @@ private: const Order *order = this->vehicle->GetOrder(this->order_id); for (int i = 0; i < _sorted_standard_cargo_specs_size; i++) { const CargoSpec *cs = _sorted_cargo_specs[i]; - CargoID cargo_id = GetCargoIDByBitnum(cs->bitnum); + const CargoID cargo_id = cs->Index(); uint8 order_type = (this->variant == CTOWV_LOAD) ? (uint8) order->GetCargoLoadTypeRaw(cargo_id) : (uint8) order->GetCargoUnloadTypeRaw(cargo_id); this->GetWidget(WID_CTO_CARGO_DROPDOWN_FIRST + i)->SetDataTip(this->cargo_type_order_dropdown[order_type], tooltip); } @@ -225,7 +225,7 @@ public: delete this; } else if (WID_CTO_CARGO_DROPDOWN_FIRST <= widget && widget <= WID_CTO_CARGO_DROPDOWN_LAST) { const CargoSpec *cs = _sorted_cargo_specs[widget - WID_CTO_CARGO_DROPDOWN_FIRST]; - CargoID cargo_id = GetCargoIDByBitnum(cs->bitnum); + const CargoID cargo_id = cs->Index(); ShowDropDownMenu(this, this->cargo_type_order_dropdown, this->GetOrderActionTypeForCargo(cargo_id), widget, 0, this->cargo_type_order_dropdown_hmask); } else if (widget == WID_CTO_SET_TO_ALL_DROPDOWN) { @@ -241,7 +241,7 @@ public: } if (WID_CTO_CARGO_DROPDOWN_FIRST <= widget && widget <= WID_CTO_CARGO_DROPDOWN_LAST) { const CargoSpec *cs = _sorted_cargo_specs[widget - WID_CTO_CARGO_DROPDOWN_FIRST]; - CargoID cargo_id = GetCargoIDByBitnum(cs->bitnum); + const CargoID cargo_id = cs->Index(); uint8 order_action_type = this->GetOrderActionTypeForCargo(cargo_id); if (action_type == order_action_type) return;