mirror of https://github.com/OpenTTD/OpenTTD
Fix #9702: Display order window for vehicle group on ctrl-click only when using shared orders (#9704)
parent
f6886754ff
commit
0533b666b7
|
@ -746,17 +746,23 @@ public:
|
||||||
NOT_REACHED();
|
NOT_REACHED();
|
||||||
}
|
}
|
||||||
if (v) {
|
if (v) {
|
||||||
if (_ctrl_pressed) {
|
if (_ctrl_pressed && this->grouping == GB_SHARED_ORDERS) {
|
||||||
if (this->grouping == GB_NONE) {
|
ShowOrdersWindow(v);
|
||||||
this->SelectGroup(v->group_id);
|
|
||||||
} else {
|
|
||||||
ShowOrdersWindow(v);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this->vehicle_sel = v->index;
|
this->vehicle_sel = v->index;
|
||||||
|
|
||||||
|
if (_ctrl_pressed && this->grouping == GB_NONE) {
|
||||||
|
/*
|
||||||
|
* It only makes sense to select a group if not using shared orders
|
||||||
|
* since two vehicles sharing orders can be from different groups.
|
||||||
|
*/
|
||||||
|
this->SelectGroup(v->group_id);
|
||||||
|
}
|
||||||
|
|
||||||
SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
|
SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
|
||||||
SetMouseCursorVehicle(v, EIT_IN_LIST);
|
SetMouseCursorVehicle(v, EIT_IN_LIST);
|
||||||
_cursor.vehchain = true;
|
_cursor.vehchain = true;
|
||||||
|
|
||||||
this->SetDirty();
|
this->SetDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue