diff options
| author | celestar <celestar@openttd.org> | 2007-01-25 10:06:58 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2007-01-25 10:06:58 +0000 |
| commit | b0a0086e7cd09d4bd28838fb3aa0fec6b9fc7857 (patch) | |
| tree | dd1d248343ebc3dd9af716726f0d4ebc74c285f0 /src/roadveh_cmd.cpp | |
| parent | 600cb8a314eb1165bcef1309ebe3b7fd237e9778 (diff) | |
| download | openttd-b0a0086e7cd09d4bd28838fb3aa0fec6b9fc7857.tar.xz | |
(svn r8402) -Codechange: Move RoadStop-specific enums to the RoadStop class, and changed a one-member enum into a static const. Simplify their naming and add some doxygen-comments to RoadStop
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 4e35d0a41..63d02107d 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -695,7 +695,7 @@ static void ProcessRoadVehOrder(Vehicle *v) rs = GetPrimaryRoadStop( GetStation(order->dest), - v->cargo_type == CT_PASSENGERS ? RS_BUS : RS_TRUCK + v->cargo_type == CT_PASSENGERS ? RoadStop::BUS : RoadStop::TRUCK ); if (rs != NULL) { @@ -1077,7 +1077,7 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir bitmask = 0; } else { /* Our station */ - RoadStopType rstype = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK; + RoadStop::Type rstype = (v->cargo_type == CT_PASSENGERS) ? RoadStop::BUS : RoadStop::TRUCK; if (GetRoadStopType(tile) != rstype) { // wrong station type @@ -1663,7 +1663,7 @@ void OnNewDay_RoadVeh(Vehicle *v) /* update destination */ if (v->current_order.type == OT_GOTO_STATION && v->u.road.slot == NULL && !(v->vehstatus & VS_CRASHED)) { Station* st = GetStation(v->current_order.dest); - RoadStop* rs = GetPrimaryRoadStop(st, v->cargo_type == CT_PASSENGERS ? RS_BUS : RS_TRUCK); + RoadStop* rs = GetPrimaryRoadStop(st, v->cargo_type == CT_PASSENGERS ? RoadStop::BUS : RoadStop::TRUCK); RoadStop* best = NULL; if (rs != NULL) { |