mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-22 11:44:17 +01:00
Code Issues Releases Wiki Activity

Codefix: Clean up object area placement (#15062)

Browse Source
This commit is contained in:
Tyler Trahan
2026-01-08 15:51:03 -05:00
committed by GitHub
parent 09a8b1cf5c
commit b41e23270d
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/object_cmd.cpp
View File

@@ -391,7 +391,7 @@ CommandCost CmdBuildObject(DoCommandFlags flags, TileIndex tile, ObjectType type
* @param start_tile start tile of area dragging
* @param type the object type to build
* @param view the view for the object
* @param diagonal Whether to use the Orthogonal (0) or Diagonal (1) iterator.
* @param diagonal Whether to use the Diagonal or Orthogonal tile iterator.
* @return the cost of this operation or an error
*/
CommandCost CmdBuildObjectArea(DoCommandFlags flags, TileIndex tile, TileIndex start_tile, ObjectType type, uint8_t view, bool diagonal)

8
src/object_gui.cpp
View File

@@ -351,15 +351,9 @@ public:
assert(select_proc == DDSP_BUILD_OBJECT);
if (!_settings_game.construction.freeform_edges) {
/* When end_tile is MP_VOID, the error tile will not be visible to the
* user. This happens when terraforming at the southern border. */
if (TileX(end_tile) == Map::MaxX()) end_tile += TileDiffXY(-1, 0);
if (TileY(end_tile) == Map::MaxY()) end_tile += TileDiffXY(0, -1);
}
const ObjectSpec *spec = ObjectClass::Get(_object_gui.sel_class)->GetSpec(_object_gui.sel_type);
Command<CMD_BUILD_OBJECT_AREA>::Post(STR_ERROR_CAN_T_BUILD_OBJECT, CcPlaySound_CONSTRUCTION_OTHER,
end_tile, start_tile, spec->Index(), _object_gui.sel_view, (_ctrl_pressed ? true : false));
end_tile, start_tile, spec->Index(), _object_gui.sel_view, _ctrl_pressed);
}
void OnPlaceObjectAbort() override

2
src/terraform_cmd.cpp
View File

@@ -308,7 +308,7 @@ std::tuple<CommandCost, Money, TileIndex> CmdTerraformLand(DoCommandFlags flags,
* @param flags for this command type
* @param tile end tile of area-drag
* @param start_tile start tile of area drag
* @param diagonal Whether to use the Orthogonal (false) or Diagonal (true) iterator.
* @param diagonal Whether to use the Diagonal or Orthogonal tile iterator.
* @param LevelMode Mode of leveling \c LevelMode.
* @return the cost of this operation or an error
*/

2
src/terraform_gui.cpp
View File

@@ -281,7 +281,7 @@ struct TerraformToolbarWindow : Window {
if (TileY(end_tile) == Map::MaxY()) end_tile += TileDiffXY(0, -1);
}
Command<CMD_BUILD_OBJECT_AREA>::Post(STR_ERROR_CAN_T_PURCHASE_THIS_LAND, CcPlaySound_CONSTRUCTION_RAIL,
end_tile, start_tile, OBJECT_OWNED_LAND, 0, (_ctrl_pressed ? true : false));
end_tile, start_tile, OBJECT_OWNED_LAND, 0, _ctrl_pressed);
break;
}
}