(svn r11455) -Codechange: make autoroad, 'normal' road building and 'normal' rail building all react the same on CTRL as autorail.

This commit is contained in:
rubidium 2007-11-18 08:03:48 +00:00
parent 80a7a91730
commit 5b21a839a9
2 changed files with 7 additions and 5 deletions

View File

@ -516,8 +516,7 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
if (_ctrl_pressed) _remove_button_clicked = true;
HandleAutodirPlacement();
_remove_button_clicked = old;
break;
}
} break;
case DDSP_BUILD_SIGNALS:
HandleAutoSignalPlacement();
@ -540,9 +539,12 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
break;
case DDSP_PLACE_RAIL_NE:
case DDSP_PLACE_RAIL_NW:
case DDSP_PLACE_RAIL_NW: {
bool old = _remove_button_clicked;
if (_ctrl_pressed) _remove_button_clicked = true;
DoRailroadTrack(e->we.place.select_proc == DDSP_PLACE_RAIL_NE ? TRACK_X : TRACK_Y);
break;
_remove_button_clicked = old;
} break;
}
}
break;

View File

@ -504,7 +504,7 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
_place_road_flag = (RoadFlags)((_place_road_flag & RF_DIR_Y) ? (_place_road_flag & 0x07) : (_place_road_flag >> 3));
DoCommandP(end_tile, start_tile, _place_road_flag | (_cur_roadtype << 3) | _ctrl_pressed << 5, CcPlaySound1D,
_remove_button_clicked ?
(_ctrl_pressed || _remove_button_clicked) ?
CMD_REMOVE_LONG_ROAD | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_road) :
CMD_BUILD_LONG_ROAD | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_road));
break;