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

Changes required to allow Debug mode to run on an unmodified Windows XP install, without XInput_9_01.dll

This commit is contained in:
Echelon9 2012-11-30 23:40:54 +11:00
parent 1d68c18bdd
commit 44e9bca20e
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CxbxKrnl/Emu.cpp
View File

@ -279,9 +279,10 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
}
}
// Smashing drive *NTSC*
if(e->ExceptionRecord->ExceptionCode == 0xC0000005)
{
// Smashing drive *NTSC*
if(e->ContextRecord->Eip == 0xA41F5)
{
// Skip call to D3D::SwapStart(class D3D::CDevice *)
@ -292,11 +293,8 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
return EXCEPTION_CONTINUE_EXECUTION;
}
}
// House of the Dead 3 *NTSC*
if(e->ExceptionRecord->ExceptionCode == 0xC0000005)
{
if(e->ContextRecord->Eip == 0xB961E)
{
e->ContextRecord->Eip += 2;
@ -308,6 +306,7 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
return EXCEPTION_CONTINUE_EXECUTION;
}
// House of the Dead 3 *NTSC*
if(e->ContextRecord->Eip == 0x1197F4)
{
e->ContextRecord->Eip += 2;

4
src/CxbxKrnl/EmuXInput.cpp
View File

@ -71,7 +71,7 @@ static BOOL g_bXInputInitialized = FALSE;
// ******************************************************************
// * func: EmuXInputPCPoll
// ******************************************************************
void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
/*void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
{
//
// Get the PC's XInput values
@ -99,4 +99,4 @@ void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
Controller->Gamepad.bAnalogButtons[5] = (g_Controller.Gamepad.wButtons & 0x0200) ? 1 : 0;
Controller->Gamepad.bAnalogButtons[6] = g_Controller.Gamepad.bLeftTrigger;
Controller->Gamepad.bAnalogButtons[7] = g_Controller.Gamepad.bRightTrigger;
}
}*/

2
src/CxbxKrnl/EmuXInput.h
View File

@ -37,6 +37,6 @@
// ******************************************************************
// * func: EmuXInputPCPoll
// ******************************************************************
void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );
// void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );
#endif