From cbad1f9bd57cc9bec17db03a402c75c5a424d962 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 13 Mar 2010 22:29:14 +0000
Subject: [PATCH] Small cleanups: Fixed a typo in HwWrite.cpp (could fix games)
 and removed double system reset call.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2709 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/HwWrite.cpp                               | 4 ++--
 pcsx2/gui/MainMenuClicks.cpp                    | 1 -
 plugins/GSdx/GSDevice9.cpp                      | 7 ++++---
 plugins/GSdx/GSDevice9.h                        | 2 +-
 plugins/spu2-x/src/Windows/ConfigDebug.cpp      | 2 +-
 plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp
index e71d68dc43..56a2ce86d8 100644
--- a/pcsx2/HwWrite.cpp
+++ b/pcsx2/HwWrite.cpp
@@ -955,7 +955,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value )
 			} 
 			else 
 			{
-			    cpuRegs.interrupt &= ~(1<<10) | ~(1<<1); //Tekken tag seems to stop vif and start it again in normal, so we will cancel the mfifo loop
+			    cpuRegs.interrupt &= ~((1 << 1) | (1 << 10)); //Tekken tag seems to stop vif and start it again in normal, so we will cancel the mfifo loop
 			}
 			
 			DmaExec(dmaVIF1, mem, value);
@@ -1236,4 +1236,4 @@ void __fastcall hwWrite128_generic(u32 mem, const mem128_t *srcval)
 			UnknownHW_LOG("Unknown Hardware write 128 at %x with value %x_%x (status=%x)", mem, srcval[1], srcval[0], cpuRegs.CP0.n.Status.val);
 		break;
 	}
-}
+}
\ No newline at end of file
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index c28a6d0d15..ea4d75bb67 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -253,7 +253,6 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
 		}
 	}
 	
-	sApp.SysReset();
 	sApp.SysReset();
 	sApp.SysExecute( g_Conf->CdvdSource );
 }
diff --git a/plugins/GSdx/GSDevice9.cpp b/plugins/GSdx/GSDevice9.cpp
index 14ce82a883..83a42de4b2 100644
--- a/plugins/GSdx/GSDevice9.cpp
+++ b/plugins/GSdx/GSDevice9.cpp
@@ -30,7 +30,7 @@ GSDevice9::GSDevice9()
 	m_rbswapped = true;
 
 	memset(&m_pp, 0, sizeof(m_pp));
-	memset(&m_ddcaps, 0, sizeof(m_ddcaps));
+	//memset(&m_ddcaps, 0, sizeof(m_ddcaps)); // Unreferenced
 	memset(&m_d3dcaps, 0, sizeof(m_d3dcaps));
 
 	memset(&m_state, 0, sizeof(m_state));
@@ -61,7 +61,8 @@ bool GSDevice9::Create(GSWnd* wnd)
 
 	// dd
 
-	CComPtr<IDirectDraw7> dd; 
+	// Unreferenced
+	/*CComPtr<IDirectDraw7> dd; 
 
 	hr = DirectDrawCreateEx(0, (void**)&dd, IID_IDirectDraw7, 0);
 
@@ -75,7 +76,7 @@ bool GSDevice9::Create(GSWnd* wnd)
 
 	if(FAILED(hr)) return false;
 
-	dd = NULL;
+	dd = NULL;*/
 
 	// d3d
 
diff --git a/plugins/GSdx/GSDevice9.h b/plugins/GSdx/GSDevice9.h
index ea37664621..dfeaf93bca 100644
--- a/plugins/GSdx/GSDevice9.h
+++ b/plugins/GSdx/GSDevice9.h
@@ -68,7 +68,7 @@ class GSDevice9 : public GSDeviceDX
 
 	//
 
-	DDCAPS m_ddcaps;
+	//DDCAPS m_ddcaps; // Unreferenced
 	D3DCAPS9 m_d3dcaps;
 	D3DPRESENT_PARAMETERS m_pp;
 	CComPtr<IDirect3D9> m_d3d;
diff --git a/plugins/spu2-x/src/Windows/ConfigDebug.cpp b/plugins/spu2-x/src/Windows/ConfigDebug.cpp
index f029f329d2..7e1c62d84b 100644
--- a/plugins/spu2-x/src/Windows/ConfigDebug.cpp
+++ b/plugins/spu2-x/src/Windows/ConfigDebug.cpp
@@ -138,7 +138,7 @@ void EnableControls( HWND hWnd )
 static BOOL CALLBACK DialogProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
 	int wmId,wmEvent;
-	wchar_t temp[384]={0};
+	//wchar_t temp[384]={0};
 
 	switch(uMsg)
 	{
diff --git a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
index c71992186e..faa95b1074 100644
--- a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
+++ b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
@@ -67,7 +67,7 @@ void SoundtouchCfg::WriteSettings()
 BOOL CALLBACK SoundtouchCfg::DialogProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
 	int wmId,wmEvent;
-	wchar_t temp[384]={0};
+	//wchar_t temp[384]={0};
 
 	switch(uMsg)
 	{