summaryrefslogtreecommitdiff
path: root/src/newgrf_canal.cpp
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2008-02-02 09:28:43 +0000
committerpeter1138 <peter1138@openttd.org>2008-02-02 09:28:43 +0000
commitc05d10dd355f5fcbfdf68066bc8d5cabff9f8e3b (patch)
tree44979390033d921d0bb48f8dddd3dec3c4d7267b /src/newgrf_canal.cpp
parent6e761a18d6fd0a8bf3039bdaeaecac58397e0366 (diff)
downloadopenttd-c05d10dd355f5fcbfdf68066bc8d5cabff9f8e3b.tar.xz
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
stored for buoys, docks, locks and depots. All these are now allowed on rivers and removal of them will revert to the original water type.
Diffstat (limited to 'src/newgrf_canal.cpp')
-rw-r--r--src/newgrf_canal.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/newgrf_canal.cpp b/src/newgrf_canal.cpp
index 1a276ea7d..df3d7630c 100644
--- a/src/newgrf_canal.cpp
+++ b/src/newgrf_canal.cpp
@@ -22,7 +22,8 @@ WaterFeature _water_feature[CF_END];
* three functions are stubs. */
static uint32 CanalGetRandomBits(const ResolverObject *object)
{
- return GetWaterTileRandomBits(object->u.canal.tile);
+ /* Return random bits only for water tiles, not station tiles */
+ return IsTileType(object->u.canal.tile, MP_WATER) ? GetWaterTileRandomBits(object->u.canal.tile) : 0;
}