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

Change: Allow building canal by area outside editor (#10173)

pull/10195/head
Tyler Trahan 2022-11-23 15:48:19 -07:00 committed by GitHub
parent 53682b4b6b
commit 0fc7cdb1e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dock_gui.cpp
View File

@ -192,7 +192,7 @@ struct BuildDocksToolbarWindow : Window {
{ {
switch (this->last_clicked_widget) { switch (this->last_clicked_widget) {
case WID_DT_CANAL: // Build canal button case WID_DT_CANAL: // Build canal button
VpStartPlaceSizing(tile, (_game_mode == GM_EDITOR) ? VPM_X_AND_Y : VPM_X_OR_Y, DDSP_CREATE_WATER); VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_CREATE_WATER);
break; break;
case WID_DT_LOCK: // Build lock button case WID_DT_LOCK: // Build lock button

6
src/water_cmd.cpp
View File

@ -443,12 +443,6 @@ CommandCost CmdBuildCanal(DoCommandFlag flags, TileIndex tile, TileIndex start_t
/* Outside of the editor you can only build canals, not oceans */ /* Outside of the editor you can only build canals, not oceans */
if (wc != WATER_CLASS_CANAL && _game_mode != GM_EDITOR) return CMD_ERROR; if (wc != WATER_CLASS_CANAL && _game_mode != GM_EDITOR) return CMD_ERROR;
/* Outside the editor you can only drag canals, and not areas */
if (_game_mode != GM_EDITOR) {
TileArea ta(tile, start_tile);
if (ta.w != 1 && ta.h != 1) return CMD_ERROR;
}
CommandCost cost(EXPENSES_CONSTRUCTION); CommandCost cost(EXPENSES_CONSTRUCTION);
std::unique_ptr<TileIterator> iter; std::unique_ptr<TileIterator> iter;