From 83118af42ef721d9bf9f06bd571acad7a0b06459 Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Tue, 22 May 2001 17:40:06 +0000 Subject: [PATCH] Fixed timer bug --- zsnes/src/gui/gui.asm | 2 ++ zsnes/src/win/winlink.cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index c2e11427..168a6d96 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -176,6 +176,7 @@ EXTSYM numlockptr %ifdef __WIN32__ EXTSYM CheckPriority EXTSYM CheckAlwaysOnTop +EXTSYM ReInitTimer %endif %ifdef __LINUX__ EXTSYM numlockptr @@ -3320,6 +3321,7 @@ DisplayBoxes: %ifdef __WIN32__ pushad call CheckPriority + call ReInitTimer popad %endif jmp .finstuff diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index 62d2f64a..c7eff7e2 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -219,6 +219,20 @@ extern "C" void MinimizeWindow() IsMinimized = TRUE; } +extern "C" void ReInitTimer() +{ + if (AlternateTimer == 0) + { + QueryPerformanceCounter((LARGE_INTEGER*)&start); + QueryPerformanceCounter((LARGE_INTEGER*)&start2); + } + else + { + start = timeGetTime(); + start2 = timeGetTime(); + } +} + extern "C" BYTE MouseWheel; BOOL InputRead(void)