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

3925 halo etc

This commit is contained in:
Aaron Robinson 2003-08-19 01:45:22 +00:00
parent 2f62eb9391
commit d1174d175e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/Cxbx.h
View File

@ -61,16 +61,16 @@ typedef signed long sint32;
// ******************************************************************
// * Define this to trace intercepted function calls
// ******************************************************************
#define _DEBUG_TRACE
//#define _DEBUG_TRACE
#define _DEBUG_WARNINGS
// ******************************************************************
// * Version information
// ******************************************************************
#ifndef _DEBUG_TRACE
#define _CXBX_VERSION "0.7.8-Pre1"
#define _CXBX_VERSION "0.7.8-Pre2"
#else
#define _CXBX_VERSION "0.7.8-Pre1-Trace"
#define _CXBX_VERSION "0.7.8-Pre2-Trace"
#endif
// ******************************************************************

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

@ -516,7 +516,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit
EmuSwapFS(); // XBox FS
// _USE_XGMATH Disabled in mesh :[
_asm int 3
//_asm int 3
Entry();

8
Source/Win32/CxbxKrnl/EmuD3D8.cpp
View File

@ -2638,7 +2638,7 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_AddRef
IDirect3DResource8 *pResource8 = pThis->EmuResource8;
if(pThis->Common & X_D3DCOMMON_TYPE_PALETTE)
if(pThis->Lock == 0x8000BEEF)
uRet = ++pThis->Lock;
else if(pResource8 != 0)
uRet = pResource8->AddRef();
@ -2675,7 +2675,7 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_Release
IDirect3DResource8 *pResource8 = pThis->EmuResource8;
if(pThis->Common & X_D3DCOMMON_TYPE_PALETTE)
if(pThis->Lock == 0x8000BEEF)
{
delete[] (PVOID)pThis->Data;
uRet = --pThis->Lock;
@ -5059,8 +5059,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreatePalette
32*sizeof(D3DCOLOR) // D3DPALETTE_32
};
(*ppPalette)->Common = X_D3DCOMMON_TYPE_PALETTE;
(*ppPalette)->Lock = 1; // emulated reference count for palettes
(*ppPalette)->Common = 0;
(*ppPalette)->Lock = 0x8000BEEF; // emulated reference count for palettes
(*ppPalette)->Data = (DWORD)new uint08[lk[Size]];
EmuSwapFS(); // XBox FS