cpp/openttd-patchpack/source Changeset - r2666:0a128e8e5a11

Changeset - r2666:0a128e8e5a11

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 19 years ago 2005-11-16 14:07:34
tron@openttd.org

(svn r3208) Don't explicitly pass the engine type to look for to GetRearEngine(), because it's the engine type of the vehicle which gets passed as first parameter

3 files changed with 5 insertions and 5 deletions:

train_cmd.c

vehicle.c

vehicle.h

0 comments (0 inline, 0 general)

train_cmd.c

➞

Show inline comments

@@ @@ -1080,13 +1080,13 @@ int32 CmdStartStopTrain(int x, int y, ui @@
  * engine is 'started', first 'close' that before 'closing' our
  * searched engine
  */
-Vehicle *GetRearEngine(const Vehicle *v, EngineID engine)
+Vehicle* GetRearEngine(const Vehicle* v)
+{
 	Vehicle *u;
 	int en_count = 1;
 	for (u = v->next; u != NULL; u = u->next) {
-		if (u->engine_type == engine) { // find matching engine
+		if (u->engine_type == v->engine_type) { // find matching engine
 			en_count += (IS_FIRSTHEAD_SPRITE(u->spritenum)) ? +1 : -1;
 			if (en_count == 0) return (Vehicle *)u;
@@ @@ -1142,7 +1142,7 @@ int32 CmdSellRailWagon(int x, int y, uin @@
 			/* 1. Delete the engine, if it is dualheaded also delete the matching
 			* rear engine of the loco (from the point of deletion onwards) */
-			Vehicle *rear = (RailVehInfo(v->engine_type)->flags & RVI_MULTIHEAD) ? GetRearEngine(v, v->engine_type) : NULL;
+			Vehicle* rear = (RailVehInfo(v->engine_type)->flags & RVI_MULTIHEAD) ? GetRearEngine(v) : NULL;
 			if (rear != NULL) {
 				cost -= v->value;
 				if (flags & DC_EXEC) {

vehicle.c

➞

Show inline comments

@@ @@ -1491,7 +1491,7 @@ static Vehicle *GetNextEnginePart(Vehicl @@
 	switch (v->type) {
 		case VEH_Train:
 			if (RailVehInfo(v->engine_type)->flags & RVI_MULTIHEAD) {
-				return GetRearEngine(v, v->engine_type);
 				return GetRearEngine(v);
+			}
 			if (v->next != NULL && v->next->subtype == TS_Artic_Part) return v->next;
 			break;

vehicle.h

➞

Show inline comments

@@ @@ -311,7 +311,7 @@ void DecreaseVehicleValue(Vehicle *v); @@
 void CheckVehicleBreakdown(Vehicle *v);
 void AgeVehicle(Vehicle *v);
 void VehicleEnteredDepotThisTick(Vehicle *v);
-Vehicle *GetRearEngine(const Vehicle *v, EngineID engine);
+Vehicle* GetRearEngine(const Vehicle* v);
 void BeginVehicleMove(Vehicle *v);
 void EndVehicleMove(Vehicle *v);

0 comments (0 inline, 0 general)