diff options
| -rw-r--r-- | src/openttd.cpp | 10 | ||||
| -rw-r--r-- | src/water_cmd.cpp | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 931651577..b57357ac8 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -2086,6 +2086,16 @@ bool AfterLoadGame() FOR_ALL_INDUSTRIES(i) i->founder = OWNER_NONE; } + if (CheckSavegameVersion(72)) { + /* Locks/shiplifts in very old savegames had OWNER_WATER as owner */ + for (TileIndex t = 0; t < MapSize(); t++) { + if (IsTileType(t, MP_WATER) && GetWaterTileType(t) == WATER_TILE_LOCK && + GetTileOwner(t) == OWNER_WATER) { + SetTileOwner(t, OWNER_NONE); + } + } + } + /* Recalculate */ Group *g; FOR_ALL_GROUPS(g) { diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index e8d201c3a..a15c3b96f 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -169,7 +169,7 @@ static CommandCost RemoveShiplift(TileIndex tile, uint32 flags) { TileIndexDiff delta = TileOffsByDiagDir(GetLockDirection(tile)); - if (!CheckTileOwnership(tile)) return CMD_ERROR; + if (!CheckTileOwnership(tile) && GetTileOwner(tile) != OWNER_NONE) return CMD_ERROR; /* make sure no vehicle is on the tile. */ if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(tile + delta) || !EnsureNoVehicle(tile - delta)) @@ -296,7 +296,7 @@ static CommandCost ClearTile_Water(TileIndex tile, byte flags) return_cmd_error(STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP); } - if (GetTileOwner(tile) != OWNER_WATER && !CheckTileOwnership(tile)) return CMD_ERROR; + if (GetTileOwner(tile) != OWNER_WATER && GetTileOwner(tile) != OWNER_NONE && !CheckTileOwnership(tile)) return CMD_ERROR; if (flags & DC_EXEC) DoClearSquare(tile); return CommandCost(_price.clear_water); @@ -798,8 +798,10 @@ static void ChangeTileOwner_Water(TileIndex tile, PlayerID old_player, PlayerID if (new_player != PLAYER_SPECTATOR) { SetTileOwner(tile, new_player); - } else { + } else if (IsShipDepot(tile)) { DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); + } else { + SetTileOwner(tile, OWNER_NONE); } } |