From b8963032e7f86615ed57c0cca63dc74a65fdff69 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 13 Jan 2009 19:48:33 +0000 Subject: [PATCH] (svn r15071) -Fix (r14919): When drag&dropping rail-stations with X orientation, distant-join scanned a wrong area for stations. --- src/rail_gui.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index cb7ac7856a..87e8901e0e 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -880,11 +880,14 @@ static void HandleStationPlacement(TileIndex start, TileIndex end) w = ex - sx + 1; h = ey - sy + 1; - if (_railstation.orientation == AXIS_X) Swap(w, h); + uint numtracks = w; + uint platlength = h; + if (_railstation.orientation == AXIS_X) Swap(numtracks, platlength); + uint32 p1 = _cur_railtype | _railstation.orientation << 4 | _ctrl_pressed << 24; uint32 p2 = _railstation.station_class | _railstation.station_type << 8 | INVALID_STATION << 16; - CommandContainer cmdcont = { TileXY(sx, sy), p1 | w << 8 | h << 16, p2, CMD_BUILD_RAILROAD_STATION | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION), CcStation, "" }; + CommandContainer cmdcont = { TileXY(sx, sy), p1 | numtracks << 8 | platlength << 16, p2, CMD_BUILD_RAILROAD_STATION | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION), CcStation, "" }; ShowSelectStationIfNeeded(cmdcont, w, h); }