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

halo being fixed

This commit is contained in:
Aaron Robinson 2003-10-05 22:21:20 +00:00
parent 619351a9c3
commit db03fe9e1e
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/Todo.txt
View File

@ -1,5 +1,7 @@
Cxbx Todo (* denotes high priority, + denotes medium priority)
* Stella has a memory leak in the game's list screen..
* SetPushBufferSize -> 0x184CC0 (Halo)..too small to detect?
* DirectSoundUseFullHRTF -> 0x192D8C (Halo)..too small to detect?

6
Source/Win32/CxbxKrnl/Emu.cpp
View File

@ -612,15 +612,15 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
{
if(e->ContextRecord->Eip == 0x3394C)
{
if(e->ContextRecord->Eax == 0x803BD800 && e->ContextRecord->Ecx == 0x803BD800)
if(e->ContextRecord->Ecx == 0x803BD800)
{
uint32 fix = g_HaloHack[1] + (0x803BD800 - 0x803A6000);
uint32 fix = g_HaloHack[1] + (e->ContextRecord->Eax - 0x803A6000);
e->ContextRecord->Eax = e->ContextRecord->Ecx = fix;
*(uint32*)e->ContextRecord->Esp = fix;
((XTL::X_D3DResource*)fix)->Data = g_HaloHack[1] + (0x803BD9A0 - 0x803A6000);
((XTL::X_D3DResource*)fix)->Data = g_HaloHack[1] + (((XTL::X_D3DResource*)fix)->Data - 0x803A6000);
return EXCEPTION_CONTINUE_EXECUTION;
}

3
Source/Win32/CxbxKrnl/EmuD3D8Conv.cpp
View File

@ -212,9 +212,6 @@ UINT XTL::EmuFixupVerticesA
BYTE *pOrigVertexData = 0;
BYTE *pHackVertexData = 0;
if(ppNewVertexStreamZeroData != 0)
*ppNewVertexStreamZeroData = pVertexStreamZeroData;
if(pVertexStreamZeroData == 0)
{
g_pD3DDevice8->GetStreamSource(0, &pOrigVertexBuffer8, &uiStride);

6
Source/Win32/CxbxKrnl/EmuKrnl.cpp
View File

@ -1197,7 +1197,7 @@ XBSYSAPI EXPORTNUM(190) NTSTATUS NTAPI xboxkrnl::NtCreateFile
#ifdef _DEBUG_TRACE
if(FAILED(ret))
printf("EmuKrnl (0x%X): NtCreateFile Failed! (0x%.08X)", GetCurrentThreadId(), ret);
printf("EmuKrnl (0x%X): NtCreateFile Failed! (0x%.08X)\n", GetCurrentThreadId(), ret);
else
printf("EmuKrnl (0x%X): NtCreateFile = 0x%.08X\n", GetCurrentThreadId(), *FileHandle);
#endif
@ -2080,11 +2080,13 @@ XBSYSAPI EXPORTNUM(277) VOID NTAPI xboxkrnl::RtlEnterCriticalSection
// debug trace
#ifdef _DEBUG_TRACE
{
/** sorta pointless
printf("EmuKrnl (0x%X): RtlEnterCriticalSection\n"
"(\n"
" CriticalSection : 0x%.08X\n"
");\n",
GetCurrentThreadId(), CriticalSection);
//*/
}
#endif
@ -2175,11 +2177,13 @@ XBSYSAPI EXPORTNUM(294) VOID NTAPI xboxkrnl::RtlLeaveCriticalSection
// debug trace
#ifdef _DEBUG_TRACE
{
/* sorta pointless
printf("EmuKrnl (0x%X): RtlLeaveCriticalSection\n"
"(\n"
" CriticalSection : 0x%.08X\n"
");\n",
GetCurrentThreadId(), CriticalSection);
**/
}
#endif