From 3abe5911957d8ae02e11299eceef91284e2141a5 Mon Sep 17 00:00:00 2001 From: Marcus Wanners Date: Fri, 6 Mar 2009 15:18:29 +0000 Subject: [PATCH] Fixed a small bug with the overlaid framerate: If the float fps in the infobar is 60.00, the overlay shows 60. If it is something like 60.04, it shows 61. If it is something like 59.13, it shows 60. Also deleted Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h, it must have been versioned at some point by accident, causing issue 706. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2567 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h | 44 ------------------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h diff --git a/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h b/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h deleted file mode 100644 index 9f9e03b939..0000000000 --- a/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - -#ifndef _WX_RCDEFS_H -#define _WX_RCDEFS_H - - -#define WX_MSC_FULL_VER 150021022 - - - - - - - - - - - - - - - -#define WX_CPU_X86 - - - - - - - - - - -#endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8e4db354f3..a86b63f289 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1086,7 +1086,7 @@ void Renderer::SwapBuffers() if (timeGetTime() - lasttime > 1000) { lasttime = timeGetTime(); - s_fps = fpscount; + s_fps = (fpscount-1); fpscount = 0; }