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

Remove old/pointless code

This commit is contained in:
np511 2017-01-29 04:31:16 -05:00
parent de6216b37b
commit 936d9edc4c
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Gif.cpp
View File

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

2
pcsx2/gui/MemoryCardFolder.cpp
View File

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

1
plugins/GSnull/Linux/GSLinux.cpp
View File

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

4
plugins/SPU2null/SPU2.cpp
View File

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