(svn r15072) -Fix (r14919): Distant-join search-area was determined inconsistently.

This commit is contained in:
frosch 2009-01-13 19:55:27 +00:00
parent b8963032e7
commit dab9de2e61
1 changed files with 5 additions and 5 deletions

View File

@ -1102,12 +1102,12 @@ struct SelectStationWindow : Window {
int size_x; ///< Size in x direction of new station int size_x; ///< Size in x direction of new station
int size_y; ///< Size in y direction of new station int size_y; ///< Size in y direction of new station
SelectStationWindow(const WindowDesc *desc, CommandContainer cmd) : SelectStationWindow(const WindowDesc *desc, CommandContainer cmd, int w, int h) :
Window(desc, 0), Window(desc, 0),
select_station_cmd(cmd), select_station_cmd(cmd),
tile(TileVirtXY(_thd.pos.x, _thd.pos.y)), tile(cmd.tile),
size_x(_thd.size.x / TILE_SIZE), size_x(w),
size_y(_thd.size.y / TILE_SIZE) size_y(h)
{ {
this->vscroll.cap = 6; this->vscroll.cap = 6;
this->resize.step_height = 10; this->resize.step_height = 10;
@ -1243,7 +1243,7 @@ void ShowSelectStationIfNeeded(CommandContainer cmd, int w, int h)
{ {
if (StationJoinerNeeded(cmd, w, h)) { if (StationJoinerNeeded(cmd, w, h)) {
if (BringWindowToFrontById(WC_SELECT_STATION, 0)) return; if (BringWindowToFrontById(WC_SELECT_STATION, 0)) return;
new SelectStationWindow(&_select_station_desc, cmd); new SelectStationWindow(&_select_station_desc, cmd, w, h);
} else { } else {
DoCommandP(&cmd); DoCommandP(&cmd);
} }