From c4d56a1237d724dd74b1616bb644200a84e3ae3c Mon Sep 17 00:00:00 2001 From: Echelon9 Date: Sat, 10 Aug 2013 13:27:18 +1000 Subject: [PATCH] Address duplicate OOVP pattern matching, to resolve problems with Futurama. This may adversely effect Whacked support --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index e0790fa0d..bca138ba6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -3363,6 +3363,10 @@ OOVPATable D3D8_1_0_5233[] = "EmuIDirect3DDevice8_SetViewport_5344" #endif }, + /** + * Having two versions of D3Device::SetTransform in this file creates problems, + * in order to support Futurama, this second verison (added for Whacked support) + * has been disabled. // IDirect3DDevice8::SetTransform { (OOVPA*)&D3DDevice_SetTransform_1_0_5344, @@ -3372,7 +3376,7 @@ OOVPATable D3D8_1_0_5233[] = #ifdef _DEBUG_TRACE "EmuIDirect3DDevice8_SetTransform_5344" #endif - }, + },**/ // IDirect3DDevice8::GetBackBuffer2 { (OOVPA*)&D3DDevice_GetBackBuffer2_1_0_5344,