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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/genworld_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/newgrf_sound.cpp
#	src/roadveh.h
#	src/sound.cpp
#	src/station_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2022-11-26 23:04:04 +00:00
parent 0e5a09974a 7c3c92f8b8
commit 1f36c3f3e4
100 changed files with 1304 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/station_cmd.cpp
View File

@@ -3018,7 +3018,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (ret.Failed()) return ret;
cost.AddCost(ret);
if (!IsTileType(flat_tile, MP_WATER) || !IsTileFlat(flat_tile)) {
if (!HasTileWaterGround(flat_tile) || !IsTileFlat(flat_tile)) {
return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
}
@@ -3027,8 +3027,10 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
/* Get the water class of the water tile before it is cleared.*/
WaterClass wc = GetWaterClass(flat_tile);
bool add_cost = !IsWaterTile(flat_tile);
ret = DoCommand(flat_tile, 0, 0, flags | DC_ALLOW_REMOVE_WATER, CMD_LANDSCAPE_CLEAR);
if (ret.Failed()) return ret;
if (add_cost) cost.AddCost(ret);
TileIndex adjacent_tile = flat_tile + TileOffsByDiagDir(direction);
if (!IsTileType(adjacent_tile, MP_WATER) || !IsTileFlat(adjacent_tile)) {