diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-02 08:59:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-02 08:59:27 +0000 |
| commit | 61e735ba4c62e578ca16f708ac1fdc872ff6416d (patch) | |
| tree | 5deab079f0b88a32b90e1d0ed7f44a140ace2560 /src/vehicle.cpp | |
| parent | 77eaefb61c9d1cbd4e6347e3fc042565a5b7572e (diff) | |
| download | openttd-61e735ba4c62e578ca16f708ac1fdc872ff6416d.tar.xz | |
(svn r16721) -Codechange: make Is/SetRoadVehicleFront, Is/Set/HasArticulatedPart member of RoadVehicle.
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 57f9c641e..34ad91492 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -483,7 +483,7 @@ bool IsEngineCountable(const Vehicle *v) case VEH_TRAIN: return !Train::From(v)->IsArticulatedPart() && // tenders and other articulated parts !Train::From(v)->IsRearDualheaded(); // rear parts of multiheaded engines - case VEH_ROAD: return IsRoadVehFront(v); + case VEH_ROAD: return RoadVehicle::From(v)->IsRoadVehFront(); case VEH_SHIP: return true; default: return false; // Only count company buildable vehicles } @@ -603,7 +603,7 @@ void CallVehicleTicks() case VEH_SHIP: if (v->type == VEH_TRAIN && Train::From(v)->IsWagon()) continue; if (v->type == VEH_AIRCRAFT && v->subtype != AIR_HELICOPTER) continue; - if (v->type == VEH_ROAD && !IsRoadVehFront(v)) continue; + if (v->type == VEH_ROAD && !RoadVehicle::From(v)->IsRoadVehFront()) continue; v->motion_counter += (v->direction & 1) ? (v->cur_speed * 3) / 4 : v->cur_speed; /* Play a running sound if the motion counter passes 256 (Do we not skip sounds?) */ @@ -976,7 +976,7 @@ void VehicleEnterDepot(Vehicle *v) case VEH_ROAD: InvalidateWindowClasses(WC_ROADVEH_LIST); - if (!IsRoadVehFront(v)) v = v->First(); + if (!RoadVehicle::From(v)->IsRoadVehFront()) v = v->First(); break; case VEH_SHIP: |