From 695fe31b2c58b09138afff9593fd1fc837d1182e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 6 Jun 2009 15:51:03 +0000 Subject: [PATCH] ...and the days of ceaseless build fixing begin anew git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3337 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 2 +- Source/Dolphin.sln | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/Render.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 3bcd3ac290..f3f2c716ce 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -228,7 +228,7 @@ CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) if (!_Poll) { m_Mode = command.Parameter2; - ERROR_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); + INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); } } break; diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index b78d8c0148..54341b0cff 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -571,8 +571,8 @@ Global {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.Build.0 = Debug|Win32 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.ActiveCfg = Debug|Win32 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.Build.0 = Debug|Win32 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.Build.0 = DebugFast|Win32 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.ActiveCfg = DebugFast|x64 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.Build.0 = DebugFast|x64 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|Win32.ActiveCfg = Release|Win32 diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h index d049dd617c..9eadde5ef7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h @@ -86,7 +86,7 @@ public: static void DrawDebugText(); static void SetScreenshot(const char *filename); static void FlipImageData(u8 *data, int w, int h); - static bool SaveRenderTarget(const char *filename, int, int, int); + static bool SaveRenderTarget(const char *filename, int w, int h, int YOffset = 0); // Finish up the current frame, print some stats static void Swap(const TRectangle& rc);