(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.

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;
 }