From d1174d175e5c48320a448483a74efd063c3258ed Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Tue, 19 Aug 2003 01:45:22 +0000
Subject: [PATCH] 3925 halo etc

---
 Include/Cxbx.h                    | 6 +++---
 Source/Win32/CxbxKrnl/Emu.cpp     | 2 +-
 Source/Win32/CxbxKrnl/EmuD3D8.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Include/Cxbx.h b/Include/Cxbx.h
index 4e98e8aea..47634125f 100644
--- a/Include/Cxbx.h
+++ b/Include/Cxbx.h
@@ -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
 
 // ******************************************************************
diff --git a/Source/Win32/CxbxKrnl/Emu.cpp b/Source/Win32/CxbxKrnl/Emu.cpp
index 98660ce05..451a878f4 100644
--- a/Source/Win32/CxbxKrnl/Emu.cpp
+++ b/Source/Win32/CxbxKrnl/Emu.cpp
@@ -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();
 
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index d5f0b8a23..9f259b1b9 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -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