cpp/openttd-patchpack/source Changeset - r12630:4c1bfe846727

Changeset - r12630:4c1bfe846727

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 15 years ago 2009-08-06 17:35:20
smatz@openttd.org

(svn r17091) -Fix (r17089)(r17090): regression test was right

2 files changed with 14 insertions and 13 deletions:

bin/ai/regression/regression.txt

src/vehicle.cpp

0 comments (0 inline, 0 general)

bin/ai/regression/regression.txt

➞

Show inline comments

@@ @@ -8365,7 +8365,7 @@ @@
   GetNumWagons():       3
   GetLength():          24
   GetWagonEngineType(): 9
-  GetWagonAge():        0
+  GetWagonAge():        1
   GetWagonEngineType(): 27
   GetWagonAge():        0
   GetWagonEngineType(): 27
@@ @@ -8401,11 +8401,11 @@ @@
 => 1
 => 1
   Age ListDump:
 => 0
 => 0
 => 0
 => 0
 => 0
 => 1
 => 1
 => 1
 => 1
 => 1
   MaxAge ListDump:
 => 10980
 => 10980
@@ @@ -8413,11 +8413,11 @@ @@
 => 5490
 => 5490
   AgeLeft ListDump:
 => 10980
 => 10980
 => 7320
 => 5490
 => 5490
 => 10979
 => 10979
 => 7319
 => 5489
 => 5489
   CurrentSpeed ListDump:
 => 21
 => 0
@@ @@ -8435,7 +8435,7 @@ @@
 => 0
 => 0
 => 0
-=> 0
+=> -1
   ProfitLastYear ListDump:
 => 0
 => 0

src/vehicle.cpp

➞

Show inline comments

@@ @@ -576,10 +576,11 @@ static void RunVehicleDayProc() @@
 		/* Call the 32-day callback if needed */
 		if ((v->day_counter & 0x1F) == 0) {
 			uint16 callback = GetVehicleCallback(CBID_VEHICLE_32DAY_CALLBACK, 0, 0, v->engine_type, v);
-			if (callback == CALLBACK_FAILED) return;
+			if (callback != CALLBACK_FAILED) {
 			if (HasBit(callback, 0)) TriggerVehicle(v, VEHICLE_TRIGGER_CALLBACK_32); // Trigger vehicle trigger 10
 			if (HasBit(callback, 1)) v->colourmap = PAL_NONE;
+		}
+		}
 		/* This is called once per day for each vehicle, but not in the first tick of the day */
 		v->OnNewDay();

0 comments (0 inline, 0 general)