amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make WindowClass a scoped enum

Browse Source
This commit is contained in:
Rubidium
2026-04-25 20:16:40 +02:00
committed by rubidium42
parent a9a2965131
commit bcda4a72ee
134 changed files with 1361 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/order_gui.cpp
+6 -6
View File
@@ -1645,7 +1645,7 @@ static constexpr std::initializer_list<NWidgetPart> _nested_orders_train_widgets
/** Window definition for the train orders window. */
static WindowDesc _orders_train_desc(
WindowPosition::Automatic, "view_vehicle_orders_train", 384, 100,
WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
WindowClass::VehicleOrders, WindowClass::VehicleView,
WindowDefaultFlag::Construction,
_nested_orders_train_widgets,
&OrdersWindow::hotkeys
@@ -1719,7 +1719,7 @@ static constexpr std::initializer_list<NWidgetPart> _nested_orders_widgets = {
/** Window definition for the orders window for road vehicles, ships and aircraft. */
static WindowDesc _orders_desc(
WindowPosition::Automatic, "view_vehicle_orders", 384, 100,
WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
WindowClass::VehicleOrders, WindowClass::VehicleView,
WindowDefaultFlag::Construction,
_nested_orders_widgets,
&OrdersWindow::hotkeys
@@ -1747,7 +1747,7 @@ static constexpr std::initializer_list<NWidgetPart> _nested_other_orders_widgets
/** Window definition for the orders window for other companies. */
static WindowDesc _other_orders_desc(
WindowPosition::Automatic, "view_vehicle_orders_competitor", 384, 86,
WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
WindowClass::VehicleOrders, WindowClass::VehicleView,
WindowDefaultFlag::Construction,
_nested_other_orders_widgets,
&OrdersWindow::hotkeys
@@ -1755,9 +1755,9 @@ static WindowDesc _other_orders_desc(
void ShowOrdersWindow(const Vehicle *v)
{
CloseWindowById(WC_VEHICLE_DETAILS, v->index, false);
CloseWindowById(WC_VEHICLE_TIMETABLE, v->index, false);
if (BringWindowToFrontById(WC_VEHICLE_ORDERS, v->index) != nullptr) return;
CloseWindowById(WindowClass::VehicleDetails, v->index, false);
CloseWindowById(WindowClass::VehicleTimetable, v->index, false);
if (BringWindowToFrontById(WindowClass::VehicleOrders, v->index) != nullptr) return;
/* Using a different WindowDescs for _local_company causes problems.
* Due to this we have to close order windows in ChangeWindowOwner/CloseCompanyWindows,