diff options
| author | aap <aap@papnet.eu> | 2020-08-19 16:54:09 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-08-19 16:54:09 +0200 |
| commit | c2e20070ab0fc95e4aacc88098aa49a18fc96afb (patch) | |
| tree | 55ef67515c5327d590f384dfb43168a1d7a201ad | |
| parent | Merge pull request #688 from aap/master (diff) | |
| download | re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar.gz re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar.bz2 re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar.lz re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar.xz re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.tar.zst re3-c2e20070ab0fc95e4aacc88098aa49a18fc96afb.zip | |
| -rw-r--r-- | src/extras/custompipes.cpp | 1 | ||||
| -rw-r--r-- | src/rw/TexRead.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/extras/custompipes.cpp b/src/extras/custompipes.cpp index fb529b47..79254eb4 100644 --- a/src/extras/custompipes.cpp +++ b/src/extras/custompipes.cpp @@ -525,6 +525,7 @@ SetTxdFindCallback(void) CTxdStore::AddRef(slot); // TODO: function for this genericTxd = CTxdStore::GetSlot(slot)->texDict; + assert(genericTxd); if(defaultFindCB == nil) defaultFindCB = rw::Texture::findCB; rw::Texture::findCB = customFindCB; diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp index 122ce655..0ef260b1 100644 --- a/src/rw/TexRead.cpp +++ b/src/rw/TexRead.cpp @@ -289,6 +289,11 @@ CreateTxdImageForVideoCard() ConvertingTexturesScreen(i, TXDSTORESIZE, "CVT_MSG"); if (CTxdStore::GetSlot(i) != nil && CStreaming::IsObjectInCdImage(i + STREAM_OFFSET_TXD)) { +#ifdef FIX_BUGS + if(strcmp(CTxdStore::GetTxdName(i), "generic") == 0) + continue; +#endif + CStreaming::RequestTxd(i, STREAMFLAGS_KEEP_IN_MEMORY); CStreaming::RequestModelStream(0); CStreaming::FlushChannels(); |