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

(svn r10470) -Fix: clamp station build date to 16 bit value for newgrf, preventing overflow and incorrect graphics shown past a certain date.

Browse Source
This commit is contained in:
peter1138
2007-07-07 20:17:01 +00:00
parent f60d055d8d
commit 855e9d0751
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_station.cpp
View File

@@ -378,7 +378,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
case 0x42: return 0; // Rail type (XXX Get current type from GUI?) case 0x42: return 0; // Rail type (XXX Get current type from GUI?)
case 0x43: return _current_player; // Station owner case 0x43: return _current_player; // Station owner
case 0x44: return 2; // PBS status case 0x44: return 2; // PBS status
case 0xFA: return max(_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0); // Build date case 0xFA: return clamp(_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0, 65535); // Build date, clamped to a 16 bit value
} }
*available = false; *available = false;
@@ -420,7 +420,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
case 0xF3: return st->bus_stops->status; case 0xF3: return st->bus_stops->status;
case 0xF6: return st->airport_flags; case 0xF6: return st->airport_flags;
case 0xF7: return GB(st->airport_flags, 8, 8); case 0xF7: return GB(st->airport_flags, 8, 8);
case 0xFA: return max(st->build_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0); case 0xFA: return clamp(st->build_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0, 65535);
} }
/* Handle cargo variables with parameter, 0x60 to 0x65 */ /* Handle cargo variables with parameter, 0x60 to 0x65 */