cpp/openttd-patchpack/source Changeset - r17111:4d3d3bfd7c40

Changeset - r17111:4d3d3bfd7c40

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

terkhen - 14 years ago 2011-01-19 18:41:53
terkhen@openttd.org

(svn r21858) -Codechange: Give more similar names to ArticulatedPart functions.

4 files changed with 14 insertions and 14 deletions:

src/articulated_vehicles.cpp

src/train.h

src/vehicle.cpp

src/vehicle_cmd.cpp

0 comments (0 inline, 0 general)

src/articulated_vehicles.cpp

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ static const uint MAX_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 engi @@
 	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 @@
 	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(Engi @@
 	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 e @@
 	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 IsArticulatedVehicleCarryingDiffere @@
 		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 CheckConsistencyOfArticulatedVehicl @@
 		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

src/train.h

➞

Show inline comments

@@ @@ -267,7 +267,7 @@ struct Train : public GroundVehicle<Trai @@
 	 * Result is undefined for normal engine.
 	 * @return next part of articulated engine
 	 */
-	FORCEINLINE Train *GetNextArticPart() const
+	FORCEINLINE Train *GetNextArticulatedPart() const
+	{
 		assert(this->HasArticulatedPart());
 		return this->Next();
@@ @@ -302,7 +302,7 @@ struct Train : public GroundVehicle<Trai @@
 	FORCEINLINE Train *GetLastEnginePart()
+	{
 		Train *v = this;
-		while (v->HasArticulatedPart()) v = v->GetNextArticPart();
+		while (v->HasArticulatedPart()) v = v->GetNextArticulatedPart();
 		return v;
+	}
@@ @@ -313,7 +313,7 @@ struct Train : public GroundVehicle<Trai @@
 	FORCEINLINE Train *GetNextVehicle() const
+	{
 		const Train *v = this;
-		while (v->HasArticulatedPart()) v = v->GetNextArticPart();
+		while (v->HasArticulatedPart()) v = v->GetNextArticulatedPart();
 		/* v now contains the last artic part in the engine */
 		return v->Next();

src/vehicle.cpp

➞

Show inline comments

@@ @@ -2373,7 +2373,7 @@ void GetVehicleSet(VehicleSet &set, Vehi @@
 			u = u->GetFirstEnginePart();
 			while (u->index != v->index) {
 				set.Include(u->index);
-				u = u->GetNextArticPart();
+				u = u->GetNextArticulatedPart();
+			}
+		}

src/vehicle_cmd.cpp

➞

Show inline comments

@@ @@ -764,7 +764,7 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
+				}
 				if (w->type == VEH_TRAIN && Train::From(w)->HasArticulatedPart()) {
-					w = Train::From(w)->GetNextArticPart();
+					w = Train::From(w)->GetNextArticulatedPart();
 				} else if (w->type == VEH_ROAD && RoadVehicle::From(w)->HasArticulatedPart()) {
 					w = w->Next();
 				} else {
@@ @@ -780,7 +780,7 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
+			}
 			if (v->type == VEH_TRAIN && Train::From(v)->HasArticulatedPart()) {
-				v = Train::From(v)->GetNextArticPart();
+				v = Train::From(v)->GetNextArticulatedPart();
 			} else if (v->type == VEH_ROAD && RoadVehicle::From(v)->HasArticulatedPart()) {
 				v = v->Next();
 			} else {

0 comments (0 inline, 0 general)