diff options
author | rubidium <rubidium@openttd.org> | 2007-02-13 10:26:53 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-02-13 10:26:53 +0000 |
commit | a419f4aedadc526377d24e30bfd967e29255498e (patch) | |
tree | a8d30d13565c6ebb15b7a0857e33c317d033e666 /src/ship_cmd.cpp | |
parent | eab6dd989821a2cacb96a94de0da789214f6e2b4 (diff) | |
download | openttd-a419f4aedadc526377d24e30bfd967e29255498e.tar.xz |
(svn r8698) -Codechange: enumify the returns of VehicleEnterTile
Diffstat (limited to 'src/ship_cmd.cpp')
-rw-r--r-- | src/ship_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 82408ad23..6b73dade8 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -700,7 +700,7 @@ static void ShipController(Vehicle *v) } else { /* isnot inside depot */ r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); - if (r & 0x8) goto reverse_direction; + if (HASBIT(r, VETS_CANNOT_ENTER)) goto reverse_direction; /* A leave station order only needs one tick to get processed, so we can * always skip ahead. */ @@ -780,9 +780,9 @@ static void ShipController(Vehicle *v) /* Call the landscape function and tell it that the vehicle entered the tile */ r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); - if (r&0x8) goto reverse_direction; + if (HASBIT(r, VETS_CANNOT_ENTER)) goto reverse_direction; - if (!(r&0x4)) { + if (!HASBIT(r, VETS_ENTERED_WORMHOLE)) { v->tile = gp.new_tile; v->u.ship.state = TrackToTrackBits(track); } |