dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11064) -Fix [FS#553]: when autorenew is enabled and it cannot renew the vehicle anymore (because the player cannot build the engine), the aging warnings as if autorenew is not enabled are shown.

Browse Source
This commit is contained in:
rubidium
2007-09-08 22:53:10 +00:00
parent 211b8dea39
commit 10ea6cd13c
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vehicle.cpp
View File

@@ -1470,8 +1470,8 @@ static void ShowVehicleGettingOld(Vehicle *v, StringID msg)
{ {
if (v->owner != _local_player) return; if (v->owner != _local_player) return;
/* Do not show getting-old message if autorenew is active */ /* Do not show getting-old message if autorenew is active (and it can replace the vehicle) */
if (GetPlayer(v->owner)->engine_renew) return; if (GetPlayer(v->owner)->engine_renew && GetEngine(v->engine_type)->player_avail != 0) return;
SetDParam(0, _vehicle_type_names[v->type]); SetDParam(0, _vehicle_type_names[v->type]);
SetDParam(1, v->unitnumber); SetDParam(1, v->unitnumber);
@@ -1480,14 +1480,10 @@ static void ShowVehicleGettingOld(Vehicle *v, StringID msg)
void AgeVehicle(Vehicle *v) void AgeVehicle(Vehicle *v)
{ {
int age; if (v->age < 65535) v->age++;
if (v->age < 65535) int age = v->age - v->max_age;
v->age++; if (age == 366*0 || age == 366*1 || age == 366*2 || age == 366*3 || age == 366*4) v->reliability_spd_dec <<= 1;
age = v->age - v->max_age;
if (age == 366*0 || age == 366*1 || age == 366*2 || age == 366*3 || age == 366*4)
v->reliability_spd_dec <<= 1;
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
@@ -1495,7 +1491,7 @@ void AgeVehicle(Vehicle *v)
ShowVehicleGettingOld(v, STR_01A0_IS_GETTING_OLD); ShowVehicleGettingOld(v, STR_01A0_IS_GETTING_OLD);
} else if (age == 0) { } else if (age == 0) {
ShowVehicleGettingOld(v, STR_01A1_IS_GETTING_VERY_OLD); ShowVehicleGettingOld(v, STR_01A1_IS_GETTING_VERY_OLD);
} else if (age == 366*1 || age == 366*2 || age == 366*3 || age == 366*4 || age == 366*5) { } else if ((age % 366) == 0) {
ShowVehicleGettingOld(v, STR_01A2_IS_GETTING_VERY_OLD_AND); ShowVehicleGettingOld(v, STR_01A2_IS_GETTING_VERY_OLD_AND);
} }
} }