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

Merge branch 'zoning' into jgrpp

Browse Source 
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-01-01 13:09:11 +00:00
parent efa27abde5 7f84a1c501
commit b9091a0f6c
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/station_gui.cpp
View File

@@ -34,6 +34,7 @@
#include "linkgraph/linkgraph.h"
#include "zoom_func.h"
#include "departures_gui.h"
#include "zoning.h"
#include "widgets/station_widget.h"
@@ -1310,10 +1311,12 @@ struct StationViewWindow : public Window {
this->sort_orders[0] = SO_ASCENDING;
this->SelectSortOrder((SortOrder)_settings_client.gui.station_gui_sort_order);
this->owner = Station::Get(window_number)->owner;
ZoningStationWindowOpenClose(Station::Get(window_number));
}
~StationViewWindow()
{
ZoningStationWindowOpenClose(Station::Get(window_number));
DeleteWindowById(WC_TRAINS_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_TRAIN, this->owner, this->window_number).Pack(), false);
DeleteWindowById(WC_ROADVEH_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_ROAD, this->owner, this->window_number).Pack(), false);
DeleteWindowById(WC_SHIPS_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_SHIP, this->owner, this->window_number).Pack(), false);