mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix platform_get_ticks resolution to match other platforms. (#5843)

This commit is contained in:
ζeh Matt 2017-07-10 21:46:11 +02:00 committed by Michał Janiszewski
parent a8af3c7670
commit ec236f0bf5
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/platform/shared.c
View File

@ -49,6 +49,11 @@
mach_timebase_info_data_t _mach_base_info = { 0 };
#endif
#ifdef _WIN32
static uint32 _frequency = 0;
static LARGE_INTEGER _entryTimestamp;
#endif
typedef void(*update_palette_func)(const uint8*, sint32, sint32);
rct_palette_entry gPalette[256];
@ -156,10 +161,26 @@ void platform_refresh_video()
gfx_invalidate_screen();
}
static void platform_ticks_init()
{
#ifdef _WIN32
LARGE_INTEGER freq;
QueryPerformanceFrequency(&freq);
_frequency = (uint32)(freq.QuadPart / 1000);
QueryPerformanceCounter(&_entryTimestamp);
#endif
}
uint32 platform_get_ticks()
{
#ifdef _WIN32
return GetTickCount();
LARGE_INTEGER pfc;
QueryPerformanceCounter(&pfc);
LARGE_INTEGER runningDelta;
runningDelta.QuadPart = pfc.QuadPart - _entryTimestamp.QuadPart;
return (uint32)(runningDelta.QuadPart / _frequency);
#elif defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200)
return (uint32)(((mach_absolute_time() * _mach_base_info.numer) / _mach_base_info.denom) / 1000000);
#else
@ -208,6 +229,7 @@ void core_init()
{
initialised = true;
platform_ticks_init();
bitcount_init();
#if defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200)