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

Merge branch 'enhanced_viewport_overlay' into jgrpp

Browse Source 
# Conflicts:
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2017-09-04 01:24:10 +01:00
parent f77a368268 2574e46df8
commit 6df5cac0df
12 changed files with 212 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicle.cpp
View File

@@ -3341,7 +3341,7 @@ void Vehicle::RemoveFromShared()
if (this->next_shared != NULL) this->next_shared->previous_shared = this->previous_shared;
if (this->orders.list->GetNumVehicles() == 1) InvalidateVehicleOrder(this->FirstShared(), 0);
if (this->orders.list->GetNumVehicles() == 1) InvalidateVehicleOrder(this->FirstShared(), VIWD_MODIFY_ORDERS);
if (this->orders.list->GetNumVehicles() == 1 && !_settings_client.gui.enable_single_veh_shared_order_gui) {
/* When there is only one vehicle, remove the shared order list window. */