mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.0
smatz 2009-08-06 17:35:20 +00:00
parent 23fd4bedd8
commit 50d03a8751
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/ai/regression/regression.txt
View File

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

7
src/vehicle.cpp
View File

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