summaryrefslogtreecommitdiffstats
path: root/src/rw/TexRead.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-16 10:26:16 +0200
committeraap <aap@papnet.eu>2020-04-16 10:26:16 +0200
commit4b602940eb79c637f70a22046d414a0b1358eea8 (patch)
tree4c8a7e8623be3c639f60d63c25a288c8d732506d /src/rw/TexRead.cpp
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
downloadre3-4b602940eb79c637f70a22046d414a0b1358eea8.tar
re3-4b602940eb79c637f70a22046d414a0b1358eea8.tar.gz
re3-4b602940eb79c637f70a22046d414a0b1358eea8.tar.bz2
re3-4b602940eb79c637f70a22046d414a0b1358eea8.tar.lz
re3-4b602940eb79c637f70a22046d414a0b1358eea8.tar.xz
re3-4b602940eb79c637f70a22046d414a0b1358eea8.tar.zst
re3-4b602940eb79c637f70a22046d414a0b1358eea8.zip
Diffstat (limited to '')
-rw-r--r--src/rw/TexRead.cpp11
1 files changed, 5 insertions, 6 deletions
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)
{