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/station_cmd.cpp | |
parent | eab6dd989821a2cacb96a94de0da789214f6e2b4 (diff) | |
download | openttd-a419f4aedadc526377d24e30bfd967e29255498e.tar.xz |
(svn r8698) -Codechange: enumify the returns of VehicleEnterTile
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r-- | src/station_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 2e3ae49c6..d994aa7ee 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2260,7 +2260,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) if (DiagDirToAxis(dir) != AXIS_X) intswap(x, y); if (y == TILE_SIZE / 2) { if (dir != DIAGDIR_SE && dir != DIAGDIR_SW) x = TILE_SIZE - 1 - x; - if (x == 12) return 2 | (station_id << 8); /* enter station */ + if (x == 12) return VETSB_ENTERED_STATION | (station_id << VETS_STATION_ID_OFFSET); /* enter station */ if (x < 12) { uint16 spd; @@ -2279,7 +2279,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) RoadStop *rs = GetRoadStopByTile(tile, GetRoadStopType(tile)); /* Check if station is busy or if there are no free bays. */ - if (rs->IsEntranceBusy() || !rs->HasFreeBay()) return 8; + if (rs->IsEntranceBusy() || !rs->HasFreeBay()) return VETSB_CANNOT_ENTER; v->u.road.state += 32; @@ -2293,7 +2293,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) } } - return 0; + return VETSB_CONTINUE; } /* this function is called for one station each tick */ |