diff options
| author | tron <tron@openttd.org> | 2005-10-05 07:20:26 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-10-05 07:20:26 +0000 |
| commit | ae4a1f3675bab50b93e443dcca07fd297fcdc58d (patch) | |
| tree | 8281c38dbbb38386dacf57d352e00b62be0edc77 /water_cmd.c | |
| parent | 102cf2615f8ffb4e260680a5f2b3b7d9f2a7a130 (diff) | |
| download | openttd-ae4a1f3675bab50b93e443dcca07fd297fcdc58d.tar.xz | |
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
Diffstat (limited to 'water_cmd.c')
| -rw-r--r-- | water_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/water_cmd.c b/water_cmd.c index 5c9e18861..a2d33b66b 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -144,7 +144,7 @@ static int32 DoBuildShiplift(TileIndex tile, int dir, uint32 flags) static int32 RemoveShiplift(TileIndex tile, uint32 flags) { - TileIndexDiff delta = TileOffsByDir(_m[tile].m5 & 3); + TileIndexDiff delta = TileOffsByDir(GB(_m[tile].m5, 0, 2)); // make sure no vehicle is on the tile. if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(tile + delta) || !EnsureNoVehicle(tile - delta)) @@ -500,7 +500,7 @@ static void TileLoopWaterHelper(TileIndex tile, const TileIndexDiffC *offs) switch (GetTileType(target)) { case MP_RAILWAY: { uint slope = GetTileSlope(target, NULL); - byte tracks = _m[target].m5 & 0x3F; + byte tracks = GB(_m[target].m5, 0, 6); if (!( (slope == 1 && tracks == 0x20) || (slope == 2 && tracks == 0x04) || |