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

(svn r15318) -Fix [FS#2594](r10288): don't warn about non-primary engines getting old

release/0.7
smatz 2009-02-02 16:49:11 +00:00
parent 7e928974a7
commit 9723630cea
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/vehicle.cpp
View File

@ -926,17 +926,6 @@ void CheckVehicleBreakdown(Vehicle *v)
} }
} }
static void ShowVehicleGettingOld(Vehicle *v, StringID msg)
{
if (v->owner != _local_company) return;
/* Do not show getting-old message if autorenew is active (and it can replace the vehicle) */
if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return;
SetDParam(0, v->index);
AddNewsItem(msg, NS_ADVICE, v->index, 0);
}
void AgeVehicle(Vehicle *v) void AgeVehicle(Vehicle *v)
{ {
if (v->age < 65535) v->age++; if (v->age < 65535) v->age++;
@ -949,13 +938,25 @@ void AgeVehicle(Vehicle *v)
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
/* Don't warn about non-primary or not ours vehicles */
if (v->Previous() != NULL || v->owner != _local_company) return;
/* Don't warn if a renew is active */
if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return;
StringID str;
if (age == -DAYS_IN_LEAP_YEAR) { if (age == -DAYS_IN_LEAP_YEAR) {
ShowVehicleGettingOld(v, STR_01A0_IS_GETTING_OLD); str = STR_01A0_IS_GETTING_OLD;
} else if (age == 0) { } else if (age == 0) {
ShowVehicleGettingOld(v, STR_01A1_IS_GETTING_VERY_OLD); str = STR_01A1_IS_GETTING_VERY_OLD;
} else if (age > 0 && (age % DAYS_IN_LEAP_YEAR) == 0) { } else if (age > 0 && (age % DAYS_IN_LEAP_YEAR) == 0) {
ShowVehicleGettingOld(v, STR_01A2_IS_GETTING_VERY_OLD_AND); str = STR_01A2_IS_GETTING_VERY_OLD_AND;
} else {
return;
} }
SetDParam(0, v->index);
AddNewsItem(str, NS_ADVICE, v->index, 0);
} }
/** Start/Stop a vehicle /** Start/Stop a vehicle