(svn r22643) -Fix: Disallow building NewObjects on water tiles owned by another company.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
index 4425d1118..9fc5b8ee0 100644
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -214,6 +214,10 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 					/* Normal water tiles don't have to be cleared. For all other tile types clear
 					 * the tile but leave the water. */
 					cost.AddCost(DoCommand(t, 0, 0, flags & ~DC_NO_WATER, CMD_LANDSCAPE_CLEAR));
+				} else {
+					/* Can't build on water owned by another company. */
+					Owner o = GetTileOwner(t);
+					if (o != OWNER_NONE && o != OWNER_WATER) cost.AddCost(CheckOwnership(o, t));
 				}
 			} else {
 				if (!allow_ground) return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER);