summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2007-01-16 16:28:41 +0000
committerDarkvater <darkvater@openttd.org>2007-01-16 16:28:41 +0000
commit12f0e67437dfaea1f45f2954242940ffd2339a61 (patch)
treefe283432a50c81c25275716206c555c31e2ec37f
parentf3796eee66f9163fecbb36560d3742641caae04b (diff)
downloadopenttd-12f0e67437dfaea1f45f2954242940ffd2339a61.tar.xz
(svn r8158) -Fix: The submarine disaster failed to move at all due to wrong masking of trackbits
-rw-r--r--src/disaster_cmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index c63401800..aeddad150 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -672,7 +672,7 @@ static void DisasterTick_5_and_6(Vehicle *v)
tile = v->tile + TileOffsByDiagDir(DirToDiagDir(v->direction));
if (IsValidTile(tile) &&
- (r=GetTileTrackStatus(tile,TRANSPORT_WATER),(byte)(r+(r >> 8)) == 0x3F) &&
+ (r=GetTileTrackStatus(tile,TRANSPORT_WATER),(byte)(r|(r >> 8)) == 0x3F) &&
!CHANCE16(1,90)) {
GetNewVehiclePos(v, &gp);
SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);