diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-16 10:50:45 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-16 10:50:45 +0200 |
| commit | b1fc7bc533dc7d603daafbf8a158a92f710c1e60 (patch) | |
| tree | 20ec3f4fd1aeaba1ab41078cfb49a248d9421885 /src/rw/TexRead.cpp | |
| parent | first fake RW implementation working (diff) | |
| download | re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar.gz re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar.bz2 re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar.lz re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar.xz re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.tar.zst re3-b1fc7bc533dc7d603daafbf8a158a92f710c1e60.zip | |
Diffstat (limited to 'src/rw/TexRead.cpp')
| -rw-r--r-- | src/rw/TexRead.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp index c91b71c0..1ac5a75e 100644 --- a/src/rw/TexRead.cpp +++ b/src/rw/TexRead.cpp @@ -22,8 +22,8 @@ #include "RwHelper.h" #endif //GTA_PC -float &texLoadTime = *(float*)0x8F1B50; -int32 &texNumLoaded = *(int32*)0x8F252C; +float texLoadTime;// = *(float*)0x8F1B50; +int32 texNumLoaded;// = *(int32*)0x8F252C; #ifdef LIBRW #define READNATIVE(stream, tex, size) rwNativeTextureHackRead(stream, tex, size) @@ -155,7 +155,11 @@ RwTexDictionaryGtaStreamRead2(RwStream *stream, RwTexDictionary *texDict) } #ifdef GTA_PC - +#ifdef RWLIBS +extern "C" RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags); +#else +RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags); +#endif void ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8) { @@ -174,8 +178,6 @@ ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8) } } -RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags); - bool CheckVideoCardCaps(void) { |