petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r5934) -Cleanup: forgot some conversions to Year and to Date

Browse Source 
-Cleanup: use _cur_year instead of _date for some (year based) comparisons
-Cleanup: remove a magic number in favour of another (less) magic number
This commit is contained in:
rubidium
2006-08-17 20:22:35 +00:00
parent a178d2600b
commit 7cfd3eb618
8 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine.c
View File

@@ -88,11 +88,10 @@ static void SetupEngineNames(void)
static void AdjustAvailAircraft(void)
{
uint16 date = _date;
byte avail = 0;
if (date >= 12784) avail |= 2; // big airport
if (date < 14610 || _patches.always_small_airport) avail |= 1; // small airport
if (date >= 15706) avail |= 4; // enable heliport
if (_cur_year >= 1955) avail |= 2; // big airport
if (_cur_year < 1960 || _patches.always_small_airport) avail |= 1; // small airport
if (_cur_year >= 1963) avail |= 4; // enable heliport
if (avail != _avail_aircraft) {
_avail_aircraft = avail;
@@ -151,7 +150,7 @@ void StartupEngines(void)
// base intro date is before 1922 then the random number of days is not
// added.
r = Random();
e->intro_date = ei->base_intro <= 729 ? ei->base_intro : GB(r, 0, 9) + ei->base_intro;
e->intro_date = ei->base_intro <= ConvertYMDToDate(1922, 0, 1) ? ei->base_intro : (Date)GB(r, 0, 9) + ei->base_intro;
if (e->intro_date <= _date) {
e->age = (_date - e->intro_date) >> 5;
e->player_avail = (byte)-1;