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

(svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting).

Browse Source
This commit is contained in:
frosch
2011-03-13 21:33:02 +00:00
parent 91a29a6bef
commit afd2e51936
4 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/order_gui.cpp
View File

@@ -812,7 +812,6 @@ public:
*/
virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
{
if (!gui_scope) return;
VehicleOrderID from = INVALID_VEH_ORDER_ID;
VehicleOrderID to = INVALID_VEH_ORDER_ID;
@@ -820,7 +819,6 @@ public:
case -666:
/* Autoreplace replaced the vehicle */
this->vehicle = Vehicle::Get(this->window_number);
/* This case is _not_ called asynchronously. Get out directly, rest can be done later */
break;
case -1:
@@ -837,6 +835,7 @@ public:
break;
default:
if (!gui_scope) break;
if (data < 0) break;
from = GB(data, 0, 8);
to = GB(data, 8, 8);
@@ -869,7 +868,7 @@ public:
}
this->vscroll->SetCount(this->vehicle->GetNumOrders() + 1);
this->UpdateButtonState();
if (gui_scope) this->UpdateButtonState();
/* Scroll to the new order. */
if (from == INVALID_VEH_ORDER_ID && to != INVALID_VEH_ORDER_ID && !this->vscroll->IsVisible(to)) {