From eb5648f38206e98b03aa3ca5783faafdde390884 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 13 Feb 2007 10:26:53 +0000 Subject: (svn r8698) -Codechange: enumify the returns of VehicleEnterTile --- src/ship_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ship_cmd.cpp') 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); } -- cgit v1.2.3-70-g09d2