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

(svn r1465) -Fix: [1099101] starting year patch goes out of range. Clamped year between 1920-2090 as wel as adding defines for it.

Browse Source
This commit is contained in:
darkvater
2005-01-10 14:43:00 +00:00
parent 58dc91f64d
commit 781648ada3
10 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc.c
View File

@@ -443,7 +443,7 @@ uint ConvertYMDToDay(uint year, uint month, uint day)
}
// convert a date on the form
// 1920 - 2090
// 1920 - 2090 (MAX_YEAR_END_REAL)
// 192001 - 209012
// 19200101 - 20901231
// or if > 2090 and below 65536, treat it as a daycount
@@ -452,7 +452,7 @@ uint ConvertIntDate(uint date)
{
uint year, month = 0, day = 1;
if (IS_INT_INSIDE(date, 1920, 2090 + 1)) {
if (IS_INT_INSIDE(date, 1920, MAX_YEAR_END_REAL + 1)) {
year = date - 1920;
} else if (IS_INT_INSIDE(date, 192001, 209012+1)) {
month = date % 100 - 1;
@@ -700,10 +700,10 @@ void IncreaseDate()
NetworkServerYearlyLoop();
#endif /* ENABLE_NETWORK */
/* check if we reached 2090, that's the maximum year. */
if (_cur_year == 171) {
/* check if we reached 2090 (MAX_YEAR_END_REAL), that's the maximum year. */
if (_cur_year == (MAX_YEAR_END + 1)) {
Vehicle *v;
_cur_year = 170;
_cur_year = MAX_YEAR_END;
_date = 62093;
FOR_ALL_VEHICLES(v) {
v->date_of_last_service -= 365; // 1 year is 365 days long