diff --git a/pcsx2/Gif.cpp b/pcsx2/Gif.cpp index df54e1a197..5e1db8c09e 100644 --- a/pcsx2/Gif.cpp +++ b/pcsx2/Gif.cpp @@ -486,7 +486,6 @@ static u16 QWCinGIFMFIFO(u32 DrainADDR) gifstate |= GIF_STATE_EMPTY; GIF_LOG("%x Available of the %x requested", ret, gifch.qwc); - pxAssert(ret >= 0); return ret; } diff --git a/pcsx2/gui/MemoryCardFolder.cpp b/pcsx2/gui/MemoryCardFolder.cpp index 038a89fd8c..fb846878d9 100644 --- a/pcsx2/gui/MemoryCardFolder.cpp +++ b/pcsx2/gui/MemoryCardFolder.cpp @@ -1024,7 +1024,7 @@ void FolderMemoryCard::FlushFileEntries( const u32 dirCluster, const u32 remaini // empty files need to be explicitly created, as there will be no data cluster referencing it later char cleanName[sizeof( entry->entry.data.name )]; memcpy( cleanName, (const char*)entry->entry.data.name, sizeof( cleanName ) ); - bool filenameCleaned = FileAccessHelper::CleanMemcardFilename( cleanName ); + FileAccessHelper::CleanMemcardFilename( cleanName ); const wxString filePath = dirPath + L"/" + wxString::FromAscii( (const char*)cleanName ); if ( m_performFileWrites ) { diff --git a/plugins/GSnull/Linux/GSLinux.cpp b/plugins/GSnull/Linux/GSLinux.cpp index 4b1b0d1c4b..192af93a03 100644 --- a/plugins/GSnull/Linux/GSLinux.cpp +++ b/plugins/GSnull/Linux/GSLinux.cpp @@ -35,7 +35,6 @@ int GSOpenWindow(void *pDsp, const char *Title) int GSOpenWindow2(void *pDsp, u32 flags) { - GtkWidget *widget; if (pDsp != NULL) win = *(GtkScrolledWindow **)pDsp; else diff --git a/plugins/SPU2null/SPU2.cpp b/plugins/SPU2null/SPU2.cpp index d7b2c67bf4..3bbfeeaab4 100644 --- a/plugins/SPU2null/SPU2.cpp +++ b/plugins/SPU2null/SPU2.cpp @@ -855,7 +855,7 @@ SPU2write(u32 mem, u16 value) u32 r = mem & 0xffff; // channel info - if ((r >= 0x0000 && r < 0x0180) || (r >= 0x0400 && r < 0x0580)) { // some channel info? + if (r < 0x0180 || (r >= 0x0400 && r < 0x0580)) { // some channel info? int ch = 0; if (r >= 0x400) ch = ((r - 0x400) >> 4) + 24; @@ -1059,7 +1059,7 @@ SPU2read(u32 mem) u16 ret; u32 r = mem & 0xffff; - if ((r >= 0x0000 && r <= 0x0180) || (r >= 0x0400 && r <= 0x0580)) { // some channel info? + if (r <= 0x0180 || (r >= 0x0400 && r <= 0x0580)) { // some channel info? s32 ch = 0; if (r >= 0x400)