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
This commit is contained in:
ramapcsx2 2010-03-13 22:29:14 +00:00
parent 27b32ab8ab
commit cbad1f9bd5
6 changed files with 9 additions and 9 deletions

View File

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

View File

@ -253,7 +253,6 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
}
}
sApp.SysReset();
sApp.SysReset();
sApp.SysExecute( g_Conf->CdvdSource );
}

View File

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

View File

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

View File

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

View File

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