diff options
| author | terkhen <terkhen@openttd.org> | 2011-01-19 18:41:53 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-01-19 18:41:53 +0000 |
| commit | cfbbcf159736e18965ac7b187ca9a11b712edc65 (patch) | |
| tree | fe9a88a7ac34b0768d5ae6c74fcb1d23d8d5a95a /src/articulated_vehicles.cpp | |
| parent | 10a7678beb83801daed3aaf5b14b715afc4d52e3 (diff) | |
| download | openttd-cfbbcf159736e18965ac7b187ca9a11b712edc65.tar.xz | |
(svn r21858) -Codechange: Give more similar names to ArticulatedPart functions.
Diffstat (limited to 'src/articulated_vehicles.cpp')
| -rw-r--r-- | src/articulated_vehicles.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 8a67b2a9a..824611ddc 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -28,7 +28,7 @@ static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts * @param mirrored Returns whether the part shall be flipped. * @return engine to add or INVALID_ENGINE */ -static EngineID GetNextArticPart(uint index, EngineID front_type, Vehicle *front = NULL, bool *mirrored = NULL) +static EngineID GetNextArticulatedPart(uint index, EngineID front_type, Vehicle *front = NULL, bool *mirrored = NULL) { assert(front == NULL || front->engine_type == front_type); @@ -55,7 +55,7 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window) uint i; for (i = 1; i < MAX_ARTICULATED_PARTS; i++) { - if (GetNextArticPart(i, engine_type, v) == INVALID_ENGINE) break; + if (GetNextArticulatedPart(i, engine_type, v) == INVALID_ENGINE) break; } delete v; @@ -113,7 +113,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine) if (!HasBit(e->info.callback_mask, CBM_VEHICLE_ARTIC_ENGINE)) return capacity; for (uint i = 1; i < MAX_ARTICULATED_PARTS; i++) { - EngineID artic_engine = GetNextArticPart(i, engine); + EngineID artic_engine = GetNextArticulatedPart(i, engine); if (artic_engine == INVALID_ENGINE) break; cargo_capacity = GetVehicleDefaultCapacity(artic_engine, &cargo_type); @@ -138,7 +138,7 @@ bool IsArticulatedVehicleRefittable(EngineID engine) if (!HasBit(e->info.callback_mask, CBM_VEHICLE_ARTIC_ENGINE)) return false; for (uint i = 1; i < MAX_ARTICULATED_PARTS; i++) { - EngineID artic_engine = GetNextArticPart(i, engine); + EngineID artic_engine = GetNextArticulatedPart(i, engine); if (artic_engine == INVALID_ENGINE) break; if (IsEngineRefittable(artic_engine)) return true; @@ -165,7 +165,7 @@ void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, if (!HasBit(e->info.callback_mask, CBM_VEHICLE_ARTIC_ENGINE)) return; for (uint i = 1; i < MAX_ARTICULATED_PARTS; i++) { - EngineID artic_engine = GetNextArticPart(i, engine); + EngineID artic_engine = GetNextArticulatedPart(i, engine); if (artic_engine == INVALID_ENGINE) break; veh_cargos = GetAvailableVehicleCargoTypes(artic_engine, include_initial_cargo_type); @@ -223,7 +223,7 @@ bool IsArticulatedVehicleCarryingDifferentCargos(const Vehicle *v, CargoID *carg switch (v->type) { case VEH_TRAIN: - v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticPart() : NULL; + v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticulatedPart() : NULL; break; case VEH_ROAD: @@ -270,7 +270,7 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v) switch (v->type) { case VEH_TRAIN: - v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticPart() : NULL; + v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticulatedPart() : NULL; break; case VEH_ROAD: @@ -306,7 +306,7 @@ void AddArticulatedParts(Vehicle *first) Vehicle *v = first; for (uint i = 1; i < MAX_ARTICULATED_PARTS; i++) { bool flip_image; - EngineID engine_type = GetNextArticPart(i, first->engine_type, first, &flip_image); + EngineID engine_type = GetNextArticulatedPart(i, first->engine_type, first, &flip_image); if (engine_type == INVALID_ENGINE) return; /* In the (very rare) case the GRF reported wrong number of articulated parts |