openttd updated to 1.5.0-beta2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
+5 -9
View File
@@ -1,4 +1,4 @@
/* $Id: waypoint_gui.cpp 25294 2013-05-26 19:30:07Z frosch $ */
/* $Id: waypoint_gui.cpp 27030 2014-10-21 19:16:47Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -27,6 +27,8 @@
#include "table/strings.h"
#include "safeguards.h"
/** GUI for accessing waypoints and buoys. */
struct WaypointWindow : Window {
private:
@@ -65,7 +67,7 @@ public:
}
this->FinishInitNested(window_number);
if (this->wp->owner != OWNER_NONE) this->owner = this->wp->owner;
this->owner = this->wp->owner;
this->flags |= WF_DISABLE_VP_SCROLL;
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_W_VIEWPORT);
@@ -76,13 +78,7 @@ public:
~WaypointWindow()
{
Owner owner = this->owner;
/* Buoys have no owner and can be used by everyone. Show only 'our' vehicles */
if (!Company::IsValidID(owner)) owner = _local_company;
/* Well, spectators otoh */
if (Company::IsValidID(owner)) DeleteWindowById(GetWindowClassForVehicleType(this->vt), VehicleListIdentifier(VL_STATION_LIST, this->vt, owner, this->window_number).Pack(), false);
DeleteWindowById(GetWindowClassForVehicleType(this->vt), VehicleListIdentifier(VL_STATION_LIST, this->vt, this->owner, this->window_number).Pack(), false);
}
virtual void SetStringParameters(int widget) const