From 4b602940eb79c637f70a22046d414a0b1358eea8 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 16 Apr 2020 10:26:16 +0200
Subject: first fake RW implementation working

---
 src/rw/TexRead.cpp | 11 +++++------
 src/rw/rw.cpp      |  5 +++++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/rw')

diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp
index 8ada080d..c91b71c0 100644
--- a/src/rw/TexRead.cpp
+++ b/src/rw/TexRead.cpp
@@ -70,7 +70,9 @@ RwTexDictionaryGtaStreamRead(RwStream *stream)
 	if(!RwStreamFindChunk(stream, rwID_STRUCT, &size, &version))
 		return nil;
 	assert(size == 4);
-	if(RwStreamRead(stream, &numTextures, size) != size)
+int foo = RwStreamRead(stream, &numTextures, size);
+if(foo != size)
+//	if(RwStreamRead(stream, &numTextures, size) != size)
 		return nil;
 
 	texDict = RwTexDictionaryCreate();
@@ -153,11 +155,6 @@ RwTexDictionaryGtaStreamRead2(RwStream *stream, RwTexDictionary *texDict)
 }
 
 #ifdef GTA_PC
-#ifdef RWLIBS
-extern "C" RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags);
-#else
-WRAPPER RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags) { EAXJMP(0x59A350); }
-#endif
 
 void
 ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8)
@@ -177,6 +174,8 @@ ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8)
 	}
 }
 
+RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags);
+
 bool
 CheckVideoCardCaps(void)
 {
diff --git a/src/rw/rw.cpp b/src/rw/rw.cpp
index 196cf189..c525f49f 100644
--- a/src/rw/rw.cpp
+++ b/src/rw/rw.cpp
@@ -415,6 +415,9 @@ WRAPPER RxNodeDefinition* RxNodeDefinitionGetMaterialScatter() { EAXJMP(0x5DDAA0
 WRAPPER RxNodeDefinition* RxNodeDefinitionGetLight() { EAXJMP(0x5DF040); }
 WRAPPER RxNodeDefinition* RxNodeDefinitionGetPostLight() { EAXJMP(0x5DF560); }
 WRAPPER void RxD3D8AllInOneSetRenderCallBack(RxPipelineNode* node, RxD3D8AllInOneRenderCallBack callback) { EAXJMP(0x5DFC60); }
+
+WRAPPER RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags) { EAXJMP(0x59A350); }
+
 #else
 
 extern "C"
@@ -433,6 +436,8 @@ extern "C"
     void* _rwVectorOpen(void* instance, RwInt32 offset, RwInt32 size);
     RwBool _rwPluginRegistryOpen();
     RwBool _rwPluginRegistryClose();
+
+    RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags);
 }
 
 STARTPATCHES
-- 
cgit v1.2.3