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

(svn r5916) -Cleanup: use MIN_YEAR/MAX_YEAR for the year boundaries and BASE_YEAR when comparing _cur_year with a 'full' year.

Browse Source 
-Cleanup: replace some magic '1920' values with BASE_YEAR.
This commit is contained in:
rubidium
2006-08-15 15:18:03 +00:00
parent 8aa76f306d
commit 0d3ccad29f
19 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
date.c
View File

@@ -129,7 +129,7 @@ Date ConvertIntDate(uint date)
Month month = 0;
Day day = 1;
if (IS_INT_INSIDE(date, 1920, MAX_YEAR_END_REAL + 1)) {
if (IS_INT_INSIDE(date, 1920, MAX_YEAR + 1)) {
year = date - 1920;
} else if (IS_INT_INSIDE(date, 192001, 209012 + 1)) {
month = date % 100 - 1;
@@ -282,13 +282,13 @@ void IncreaseDate(void)
#endif /* ENABLE_NETWORK */
/* check if we reached end of the game */
if (_cur_year == _patches.ending_year - MAX_YEAR_BEGIN_REAL) {
if (_cur_year == _patches.ending_year - MAX_YEAR) {
ShowEndGameChart();
/* check if we reached the maximum year, decrement dates by a year */
} else if (_cur_year == (MAX_YEAR_END + 1)) {
} else if (BASE_YEAR + _cur_year == MAX_YEAR + 1) {
Vehicle *v;
_cur_year = MAX_YEAR_END;
_cur_year--;
_date -= 365;
FOR_ALL_VEHICLES(v) {
v->date_of_last_service -= 365;