# HG changeset patch # User rubidium # Date 1183986604 0 # Node ID fbba6cb67bc862a737c7d77f2572f3a1ad7d04ff # Parent 0a6d45455ae545deb5e4e351eff8e0ccd1d0b4f8 (svn r10484) -Codechange: reduce code duplication. diff -r 0a6d45455ae5 -r fbba6cb67bc8 src/newgrf_canal.cpp --- a/src/newgrf_canal.cpp Sun Jul 08 19:54:51 2007 +0000 +++ b/src/newgrf_canal.cpp Mon Jul 09 13:10:04 2007 +0000 @@ -7,6 +7,7 @@ #include "debug.h" #include "newgrf.h" #include "newgrf_callbacks.h" +#include "newgrf_commons.h" #include "newgrf_spritegroup.h" #include "newgrf_canal.h" @@ -44,8 +45,7 @@ return TileHeight(tile); case 0x81: - return ((_opt.landscape == LT_ARCTIC && GetTileZ(tile) > GetSnowLine()) ? 4 : 0) | - (_opt.landscape == LT_TROPIC ? GetTropicZone(tile) : 0); + return GetTerrainType(tile); } DEBUG(grf, 1, "Unhandled canal property 0x%02X", variable);