From ca7e4bd179f48978f394dc48c1378e84cca15fe7 Mon Sep 17 00:00:00 2001 From: "sl1nk3.s" Date: Wed, 10 Jun 2009 01:15:41 +0000 Subject: [PATCH] One char fix for the Wii menu and the cdb.vff issue as well as issue 1011, also fixed the Post build event, now copies files and directory if they're more recent without asking... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3401 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 4 ++-- Source/Core/DolphinWX/DolphinWX.vcproj | 16 ++++++++-------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 6366781e91..2680424fb9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -103,7 +103,7 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) { case 0x01: m_pFileHandle = fopen(m_Filename.c_str(), "rb"); break; case 0x02: m_pFileHandle = fopen(m_Filename.c_str(), "wb"); break; - case 0x03: m_pFileHandle = fopen(m_Filename.c_str(), "a+b"); break; + case 0x03: m_pFileHandle = fopen(m_Filename.c_str(), "r+b"); break; default: PanicAlert("CWII_IPC_HLE_Device_FileIO: unknown open mode"); break; } } @@ -130,7 +130,7 @@ CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) u32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); u32 Mode = Memory::Read_U32(_CommandAddress +0x10); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Old Seek Pos: %s, Mode: %i (Device=%s, FileSize=%s)", ThS(SeekPosition).c_str(), Mode, GetDeviceName().c_str(), ThS(m_FileLength).c_str()); + INFO_LOG(WII_IPC_FILEIO, "FileIO: Old Seek Pos: %s, Mode: %i (Device=%s, FileSize=%s)", ThS(SeekPosition).c_str(), Mode, GetDeviceName().c_str(), ThS((int)m_FileLength).c_str()); /* Zelda - TP Fix: It doesn't make much sense but it works in Zelda - TP and it's probably better than trying to read outside the file (it seeks to 0x6000 instead diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 38f757909e..dd65e02aca 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -129,7 +129,7 @@ @@ -242,7 +242,7 @@ @@ -352,7 +352,7 @@ @@ -462,7 +462,7 @@ @@ -575,7 +575,7 @@ @@ -686,7 +686,7 @@ @@ -801,7 +801,7 @@ @@ -913,7 +913,7 @@ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 4df28fca2e..4683c7c870 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1305,7 +1305,7 @@ void Renderer::DrawDebugText() OSDTime = timeGetTime() + 3000; OSDChoice = -OSDChoice; } - if (OSDTime > timeGetTime() && g_Config.bEFBCopyDisableHotKey) + if ((u32)OSDTime > timeGetTime() && g_Config.bEFBCopyDisableHotKey) { std::string T1 = ""; std::string T2 = "";