mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21864) -Fix [FS#4430]: distant-join station would build at the wrong location when having persistent building turned on and selecting a "second" location for the station tile

release/1.1
rubidium 2011-01-19 23:59:29 +00:00
parent 6435a89c28
commit 89a135293a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/station_gui.cpp
View File

@ -1481,8 +1481,6 @@ static bool StationJoinerNeeded(CommandContainer cmd, TileArea ta)
* return true (i.e. just flash the old window) */ * return true (i.e. just flash the old window) */
Window *selection_window = FindWindowById(WC_SELECT_STATION, 0); Window *selection_window = FindWindowById(WC_SELECT_STATION, 0);
if (selection_window != NULL) { if (selection_window != NULL) {
if (!_ctrl_pressed) return true;
/* Abort current distant-join and start new one */ /* Abort current distant-join and start new one */
delete selection_window; delete selection_window;
UpdateTileSelection(); UpdateTileSelection();
@ -1512,7 +1510,6 @@ void ShowSelectBaseStationIfNeeded(CommandContainer cmd, TileArea ta)
{ {
if (StationJoinerNeeded<T>(cmd, ta)) { if (StationJoinerNeeded<T>(cmd, ta)) {
if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace(); if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
if (BringWindowToFrontById(WC_SELECT_STATION, 0)) return;
new SelectStationWindow<T>(&_select_station_desc, cmd, ta); new SelectStationWindow<T>(&_select_station_desc, cmd, ta);
} else { } else {
DoCommandP(&cmd); DoCommandP(&cmd);