From 62c37b64aee5d8dde8d1b1ddea4450feba51cc4d Mon Sep 17 00:00:00 2001 From: nukeykt Date: Mon, 30 Dec 2019 04:25:40 +0900 Subject: [PATCH] Fix exhumed compiling # Conflicts: # source/exhumed/src/exhumed.cpp # source/exhumed/src/menu.cpp --- source/exhumed/src/exhumed.h | 2 +- source/exhumed/src/menu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/exhumed/src/exhumed.h b/source/exhumed/src/exhumed.h index a6b5bdd40..3c29b0391 100644 --- a/source/exhumed/src/exhumed.h +++ b/source/exhumed/src/exhumed.h @@ -249,7 +249,7 @@ extern int bVanilla; extern double g_frameDelay; -static inline double calcFrameDelay(int const maxFPS) { return maxFPS > 0 ? (timerGetFreqU64()/(double)maxFPS) : 0.0; } +static inline double calcFrameDelay(unsigned int const maxFPS) { return maxFPS ? timerGetPerformanceFrequency() / (double)maxFPS : 0.0; } enum { kPalNormal = 0, diff --git a/source/exhumed/src/menu.cpp b/source/exhumed/src/menu.cpp index 3fde49cfb..c2b81c6b2 100644 --- a/source/exhumed/src/menu.cpp +++ b/source/exhumed/src/menu.cpp @@ -335,7 +335,7 @@ void menu_DoPlasma() //uint32_t t = time(0) << 16; //uint32_t t2 = time(0) | t; - nRandom = timerGetTicksU64(); + nRandom = timerGetPerformanceCounter(); for (int i = 0; i < 5; i++) {