dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup #9725: Replace cmd_helper related functions and remove cmd_helper.h.

Browse Source
This commit is contained in:
J0anJosep
2022-01-08 12:01:37 +01:00
committed by Michael Lutz
parent 09b71c97aa
commit d9a37c915f
22 changed files with 60 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/water_cmd.cpp
View File

@@ -8,7 +8,6 @@
/** @file water_cmd.cpp Handling of water tiles. */
#include "stdafx.h"
#include "cmd_helper.h"
#include "landscape.h"
#include "viewport_func.h"
#include "command_func.h"
@@ -100,7 +99,7 @@ static void MarkCanalsAndRiversAroundDirty(TileIndex tile)
*/
CommandCost CmdBuildShipDepot(DoCommandFlag flags, TileIndex tile, Axis axis)
{
if (!IsEnumValid(axis)) return CMD_ERROR;
if (!IsValidAxis(axis)) return CMD_ERROR;
TileIndex tile2 = tile + (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
if (!HasTileWaterGround(tile) || !HasTileWaterGround(tile2)) {
@@ -439,7 +438,7 @@ bool RiverModifyDesertZone(TileIndex tile, void *)
*/
CommandCost CmdBuildCanal(DoCommandFlag flags, TileIndex tile, TileIndex start_tile, WaterClass wc, bool diagonal)
{
if (start_tile >= MapSize() || !IsEnumValid(wc)) return CMD_ERROR;
if (start_tile >= MapSize() || !IsValidWaterClass(wc)) return CMD_ERROR;
/* Outside of the editor you can only build canals, not oceans */
if (wc != WATER_CLASS_CANAL && _game_mode != GM_EDITOR) return CMD_ERROR;