gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-02 12:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12084) -Fix: 'Early retirement'-properties are signed.

Browse Source
This commit is contained in:
frosch 2008-02-08 15:34:54 +00:00
parent bf15bc9c57
commit 2173b03144
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine.cpp
View File

@ -91,8 +91,9 @@ static void CalcEngineReliability(Engine *e)
/* Check for early retirement */ /* Check for early retirement */
if (e->player_avail != 0 && !_patches.never_expire_vehicles) { if (e->player_avail != 0 && !_patches.never_expire_vehicles) {
uint retire_early = EngInfo(e - _engines)->retire_early; int retire_early = EngInfo(e - _engines)->retire_early;
if (retire_early > 0 && age >= e->duration_phase_1 + e->duration_phase_2 - retire_early * 12) { uint retire_early_max_age = max(0, e->duration_phase_1 + e->duration_phase_2 - retire_early * 12);
if (retire_early != 0 && age >= retire_early_max_age) {
/* Early retirement is enabled and we're past the date... */ /* Early retirement is enabled and we're past the date... */
e->player_avail = 0; e->player_avail = 0;
AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type); AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type);

2
src/engine.h
View File

@ -110,7 +110,7 @@ struct EngineInfo {
byte refit_cost; byte refit_cost;
byte misc_flags; byte misc_flags;
byte callbackmask; byte callbackmask;
byte retire_early; ///< Number of years early to retire vehicle int8 retire_early; ///< Number of years early to retire vehicle
StringID string_id; ///< Default name of engine StringID string_id; ///< Default name of engine
}; };