diff --git a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp index 91581b4b29..75c72920c8 100644 --- a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp +++ b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp @@ -137,7 +137,7 @@ inline bool isOverS32() { } inline bool isLess() { - return ((bool)(g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) != (bool)(g_dsp.r[DSP_REG_SR] & SR_SIGN)); + return (!(g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) != !(g_dsp.r[DSP_REG_SR] & SR_SIGN)); } inline bool isZero() { diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp index 38fdbba659..61e0468fe0 100644 --- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp @@ -388,7 +388,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event) { sscanf(txt.mb_str(), "%08x", &addr); } i=addr+4; - for(;szRAM;i++){ + for(;iszRAM) break; if(k>size) break; diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj.user b/Source/Core/DolphinWX/DolphinWX.vcproj.user new file mode 100644 index 0000000000..06d346fb6e --- /dev/null +++ b/Source/Core/DolphinWX/DolphinWX.vcproj.user @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index fa1998d148..bebe8776a8 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -177,7 +177,7 @@ u64 TexDecoder_GetHash64(const u8 *src, int len, u32 samples) data+=Step; } - if(len & 7 > 3) + if((len & 7) > 3) { u32 k1 = *(end - 1); k1 *= m;