Skip to content

Commit

Permalink
Change: Make order window hotkeys toggle for load & unload variants
Browse files Browse the repository at this point in the history
  • Loading branch information
@LordAro
LordAro committed Feb 13, 2021
1 parent 36ab9c6 commit c3e0039
Showing 1 changed file with 25 additions and 48 deletions.
73 changes: 25 additions & 48 deletions src/order_gui.cpp
View file
Expand Up @@ -576,29 +576,21 @@ struct OrdersWindow : public Window {

/**
* Handle the click on the full load button.
* @param load_type the way to load.
* @param load_type the way to load. If the selected order already has this mode set, revert back to 'load if possible'.
*/
void OrderClick_FullLoad(int load_type)
void OrderClick_FullLoad(OrderLoadFlags load_type)
{
VehicleOrderID sel_ord = this->OrderGetSel();
const Order *order = this->vehicle->GetOrder(sel_ord);

if (order == nullptr || order->GetLoadType() == load_type) return;
if (order == nullptr) return;

if (load_type < 0) {
load_type = order->GetLoadType() == OLF_LOAD_IF_POSSIBLE ? OLF_FULL_LOAD_ANY : OLF_LOAD_IF_POSSIBLE;
if (order->GetLoadType() == load_type) {
load_type = OLF_LOAD_IF_POSSIBLE; // reset to 'default'
}
DoCommandP(this->vehicle->tile, this->vehicle->index + (sel_ord << 20), MOF_LOAD | (load_type << 4), CMD_MODIFY_ORDER | CMD_MSG(STR_ERROR_CAN_T_MODIFY_THIS_ORDER));
}

/**
* Handle the 'no loading' hotkey
*/
void OrderHotkey_NoLoad()
{
this->OrderClick_FullLoad(OLFB_NO_LOAD);
}

/**
* Handle the click on the service.
*/
Expand Down Expand Up @@ -631,16 +623,17 @@ struct OrdersWindow : public Window {

/**
* Handle the click on the unload button.
* @param unload_type Unload flag to apply. If matches existing unload type, toggles to default of 'unload if possible'.
*/
void OrderClick_Unload(int unload_type)
void OrderClick_Unload(OrderUnloadFlags unload_type)
{
VehicleOrderID sel_ord = this->OrderGetSel();
const Order *order = this->vehicle->GetOrder(sel_ord);

if (order == nullptr || order->GetUnloadType() == unload_type) return;
if (order == nullptr) return;

if (unload_type < 0) {
unload_type = order->GetUnloadType() == OUF_UNLOAD_IF_POSSIBLE ? OUFB_UNLOAD : OUF_UNLOAD_IF_POSSIBLE;
if (order->GetUnloadType() == unload_type) {
unload_type = OUF_UNLOAD_IF_POSSIBLE;
}

DoCommandP(this->vehicle->tile, this->vehicle->index + (sel_ord << 20), MOF_UNLOAD | (unload_type << 4), CMD_MODIFY_ORDER | CMD_MSG(STR_ERROR_CAN_T_MODIFY_THIS_ORDER));
Expand All @@ -652,22 +645,6 @@ struct OrdersWindow : public Window {
}
}

/**
* Handle the transfer hotkey
*/
void OrderHotkey_Transfer()
{
this->OrderClick_Unload(OUFB_TRANSFER);
}

/**
* Handle the 'no unload' hotkey
*/
void OrderHotkey_NoUnload()
{
this->OrderClick_Unload(OUFB_NO_UNLOAD);
}

/**
* Handle the click on the nonstop button.
* @param non_stop what non-stop type to use; -1 to use the 'next' one.
Expand Down Expand Up @@ -1262,15 +1239,15 @@ struct OrdersWindow : public Window {

case WID_O_FULL_LOAD:
if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_FullLoad(-1);
this->OrderClick_FullLoad(OLF_FULL_LOAD_ANY);
} else {
ShowDropDownMenu(this, _order_full_load_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetLoadType(), WID_O_FULL_LOAD, 0, 2);
}
break;

case WID_O_UNLOAD:
if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_Unload(-1);
this->OrderClick_Unload(OUFB_UNLOAD);
} else {
ShowDropDownMenu(this, _order_unload_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetUnloadType(), WID_O_UNLOAD, 0, 8);
}
Expand Down Expand Up @@ -1361,11 +1338,11 @@ struct OrdersWindow : public Window {
break;

case WID_O_FULL_LOAD:
this->OrderClick_FullLoad(index);
this->OrderClick_FullLoad((OrderLoadFlags)index);
break;

case WID_O_UNLOAD:
this->OrderClick_Unload(index);
this->OrderClick_Unload((OrderUnloadFlags)index);
break;

case WID_O_GOTO:
Expand Down Expand Up @@ -1434,17 +1411,17 @@ struct OrdersWindow : public Window {
if (this->vehicle->owner != _local_company) return ES_NOT_HANDLED;

switch (hotkey) {
case OHK_SKIP: this->OrderClick_Skip(); break;
case OHK_DELETE: this->OrderClick_Delete(); break;
case OHK_GOTO: this->OrderClick_Goto(OPOS_GOTO); break;
case OHK_NONSTOP: this->OrderClick_Nonstop(-1); break;
case OHK_FULLLOAD: this->OrderClick_FullLoad(-1); break;
case OHK_UNLOAD: this->OrderClick_Unload(-1); break;
case OHK_NEAREST_DEPOT: this->OrderClick_NearestDepot(); break;
case OHK_ALWAYS_SERVICE: this->OrderClick_Service(-1); break;
case OHK_TRANSFER: this->OrderHotkey_Transfer(); break;
case OHK_NO_UNLOAD: this->OrderHotkey_NoUnload(); break;
case OHK_NO_LOAD: this->OrderHotkey_NoLoad(); break;
case OHK_SKIP: this->OrderClick_Skip(); break;
case OHK_DELETE: this->OrderClick_Delete(); break;
case OHK_GOTO: this->OrderClick_Goto(OPOS_GOTO); break;
case OHK_NONSTOP: this->OrderClick_Nonstop(-1); break;
case OHK_FULLLOAD: this->OrderClick_FullLoad(OLF_FULL_LOAD_ANY); break;
case OHK_UNLOAD: this->OrderClick_Unload(OUFB_UNLOAD); break;
case OHK_NEAREST_DEPOT: this->OrderClick_NearestDepot(); break;
case OHK_ALWAYS_SERVICE: this->OrderClick_Service(-1); break;
case OHK_TRANSFER: this->OrderClick_Unload(OUFB_TRANSFER); break;
case OHK_NO_UNLOAD: this->OrderClick_Unload(OUFB_NO_UNLOAD); break;
case OHK_NO_LOAD: this->OrderClick_FullLoad(OLFB_NO_LOAD); break;
default: return ES_NOT_HANDLED;
}
return ES_HANDLED;
Expand Down

0 comments on commit c3e0039

Please sign in to comment.