From 657dfff6f8d75db901823e8df56221ef39705319 Mon Sep 17 00:00:00 2001 From: masken Date: Sat, 23 Aug 2008 15:33:40 +0000 Subject: [PATCH] Fixed new warnings from r282. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@284 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HLE/HLE.cpp | 2 +- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 8037a319ec..d6b8098b35 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -103,7 +103,7 @@ void PatchFunctions() { const Debugger::CSymbol& rSymbol = Debugger::GetSymbol(SymbolIndex); u32 HLEPatchValue = (1 & 0x3f) << 26; - for (int addr = rSymbol.vaddress; addr < rSymbol.vaddress + rSymbol.size; addr+=4) { + for (size_t addr = rSymbol.vaddress; addr < rSymbol.vaddress + rSymbol.size; addr+=4) { Memory::Write_U32(HLEPatchValue | i, addr); } //PanicAlert("patched %s", OSPatches[i].m_szPatchName); diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 9225924b89..c188be072e 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -101,7 +101,7 @@ void SMB_EvilNormalize() float x = F(r3); float y = F(r3 + 4); float z = F(r3 + 8); - float inv_len = 1.0 / sqrt(x*x + y*y + z*z); + float inv_len = 1.0f / sqrtf(x*x + y*y + z*z); x *= inv_len; y *= inv_len; z *= inv_len; @@ -174,7 +174,7 @@ void SMB_atan2() // in: f1 = x, f2 = y // out: r3 = angle double angle = atan2(rPS0(1), rPS0(2)); - int angle_fixpt = angle / 3.14159 * 32767; + int angle_fixpt = (int)(angle / 3.14159 * 32767); if (angle_fixpt < -32767) angle_fixpt = -32767; if (angle_fixpt > 32767) angle_fixpt = 32767; GPR(3) = angle_fixpt;