# HG changeset patch # User glx # Date 1198032085 0 # Node ID 6b2ddb5baade1ee01f4b97a3bcffb8467ec6e3ac # Parent bb089962319d1e248af77d59628896d216104a2a (svn r11666) -Fix (r11504): when removing buoys, return to water or canal depending on their owner diff -r bb089962319d -r 6b2ddb5baade src/station_cmd.cpp --- a/src/station_cmd.cpp Tue Dec 18 21:25:44 2007 +0000 +++ b/src/station_cmd.cpp Wed Dec 19 02:41:25 2007 +0000 @@ -1908,7 +1908,7 @@ /* We have to set the water tile's state to the same state as before the * buoy was placed. Otherwise one could plant a buoy on a canal edge, * remove it and flood the land (if the canal edge is at level 0) */ - MakeWaterOrCanalDependingOnSurroundings(tile, GetTileOwner(tile)); + MakeWaterOrCanalDependingOnOwner(tile, GetTileOwner(tile)); MarkTileDirtyByTile(tile); UpdateStationVirtCoordDirty(st); diff -r bb089962319d -r 6b2ddb5baade src/water.h --- a/src/water.h Tue Dec 18 21:25:44 2007 +0000 +++ b/src/water.h Wed Dec 19 02:41:25 2007 +0000 @@ -8,6 +8,7 @@ void TileLoop_Water(TileIndex tile); void DrawShipDepotSprite(int x, int y, int image); void DrawCanalWater(TileIndex tile); +void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o); void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o); #endif /* WATER_H */ diff -r bb089962319d -r 6b2ddb5baade src/water_cmd.cpp --- a/src/water_cmd.cpp Tue Dec 18 21:25:44 2007 +0000 +++ b/src/water_cmd.cpp Wed Dec 19 02:41:25 2007 +0000 @@ -140,7 +140,7 @@ return cost.AddCost(_price.build_ship_depot); } -static void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o) +void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o) { if (o == OWNER_WATER) { MakeWater(tile);