ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a few minor code fixes. 

also added a user file that should simplify running from VS for newcomers

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5338 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nitsuja- 2010-04-12 02:00:15 +00:00
parent 3861f56d51
commit 22551a0a8a
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DSPCore/Src/DSPIntCCUtil.cpp
View File

@ -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() {

2
Source/Core/DebuggerWX/Src/MemoryWindow.cpp
View File

@ -388,7 +388,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event) {
sscanf(txt.mb_str(), "%08x", &addr);
}
i=addr+4;
for(;szRAM;i++){
for(;i<szRAM;i++){
for(k=0;k<size;k++){
if(i+k>szRAM) break;
if(k>size) break;

50
Source/Core/DolphinWX/DolphinWX.vcproj.user Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="9.00"
>
<Configurations>
<Configuration
Name="Release|Win32"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
/>
</Configuration>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
/>
</Configuration>
<Configuration
Name="DebugFast|Win32"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
/>
</Configuration>
<Configuration
Name="Release|x64"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
/>
</Configuration>
<Configuration
Name="Debug|x64"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
/>
</Configuration>
<Configuration
Name="DebugFast|x64"
>
<DebugSettings
WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

2
Source/Core/VideoCommon/Src/TextureDecoder.cpp
View File

@ -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;