miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bridge GUI broken due to confirmation dialog

Browse Source
This commit is contained in:
pelya
2016-05-17 14:41:44 +03:00
committed by Sergii Pylypenko
parent 09b1a4cf5d
commit ff28829393
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dock_gui.cpp
View File

@@ -290,7 +290,6 @@ struct BuildDocksToolbarWindow : Window {
DeleteWindowById(WC_BUILD_STATION, TRANSPORT_WATER); DeleteWindowById(WC_BUILD_STATION, TRANSPORT_WATER);
DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_WATER); DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_WATER);
DeleteWindowById(WC_SELECT_STATION, 0); DeleteWindowById(WC_SELECT_STATION, 0);
DeleteWindowByClass(WC_BUILD_BRIDGE);
} }
virtual void SelectLastTool() virtual void SelectLastTool()

3
src/rail_gui.cpp
View File

@@ -37,6 +37,7 @@
#include "station_map.h" #include "station_map.h"
#include "tunnelbridge_map.h" #include "tunnelbridge_map.h"
#include "build_confirmation_func.h"
#include "widgets/rail_widget.h" #include "widgets/rail_widget.h"
@@ -775,7 +776,7 @@ struct BuildRailToolbarWindow : Window {
DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_RAIL); DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_RAIL);
DeleteWindowById(WC_BUILD_WAYPOINT, TRANSPORT_RAIL); DeleteWindowById(WC_BUILD_WAYPOINT, TRANSPORT_RAIL);
DeleteWindowById(WC_SELECT_STATION, 0); DeleteWindowById(WC_SELECT_STATION, 0);
DeleteWindowByClass(WC_BUILD_BRIDGE); if (!ConfirmationWindowShown()) DeleteWindowByClass(WC_BUILD_BRIDGE);
} }
virtual void SelectLastTool() virtual void SelectLastTool()

3
src/road_gui.cpp
View File

@@ -29,6 +29,7 @@
#include "hotkeys.h" #include "hotkeys.h"
#include "road_gui.h" #include "road_gui.h"
#include "zoom_func.h" #include "zoom_func.h"
#include "build_confirmation_func.h"
#include "widgets/road_widget.h" #include "widgets/road_widget.h"
@@ -550,7 +551,7 @@ struct BuildRoadToolbarWindow : Window {
DeleteWindowById(WC_TRUCK_STATION, TRANSPORT_ROAD); DeleteWindowById(WC_TRUCK_STATION, TRANSPORT_ROAD);
DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_ROAD); DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_ROAD);
DeleteWindowById(WC_SELECT_STATION, 0); DeleteWindowById(WC_SELECT_STATION, 0);
DeleteWindowByClass(WC_BUILD_BRIDGE); if (!ConfirmationWindowShown()) DeleteWindowByClass(WC_BUILD_BRIDGE);
} }
virtual void SelectLastTool() virtual void SelectLastTool()

5
src/window.cpp
View File

@@ -1441,8 +1441,9 @@ void Window::InitializeData(WindowNumber window_number)
this->window_number = window_number; this->window_number = window_number;
if (this->window_class != WC_BUILD_CONFIRMATION && if (this->window_class != WC_BUILD_CONFIRMATION &&
this->window_class != WC_TOOLTIPS && this->window_class != WC_TOOLTIPS &&
this->window_class != WC_NEWS_WINDOW) { this->window_class != WC_NEWS_WINDOW &&
this->window_class != WC_BUILD_BRIDGE) {
HideBuildConfirmationWindow(); HideBuildConfirmationWindow();
} }