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

Merge branch 'master' into jgrpp (SLV_U64_TICK_COUNTER)

Browse Source 
# Conflicts:
#	src/date.cpp
#	src/date_func.h
#	src/newgrf.cpp
#	src/newgrf_animation_base.h
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/saveload.h
#	src/stdafx.h
This commit is contained in:
Jonathan G Rennison
2022-10-03 19:31:18 +01:00
parent 6fd46bf3a8 548f0496a9
commit 0818ce4ae7
15 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@@ -7191,7 +7191,7 @@ bool GetGlobalVariable(byte param, uint32 *value, const GRFFile *grffile)
return true;
case 0x0A: // animation counter
*value = _tick_counter;
*value = GB(_tick_counter, 0, 16);
return true;
case 0x0B: { // TTDPatch version
@@ -11358,7 +11358,7 @@ void LoadNewGRF(uint load_index, uint num_baseset)
YearMonthDay date_ymd = _cur_date_ymd;
Date date = _date;
DateFract date_fract = _date_fract;
uint16 tick_counter = _tick_counter;
uint64 tick_counter = _tick_counter;
uint8 tick_skip_counter = _tick_skip_counter;
byte display_opt = _display_opt;