Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

txd.img bug

Browse Source
This commit is contained in:
aap 2020-08-19 16:54:09 +02:00
parent 76fe1247c8
commit c2e20070ab
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/extras/custompipes.cpp
View File

@ -525,6 +525,7 @@ SetTxdFindCallback(void)
CTxdStore::AddRef(slot); CTxdStore::AddRef(slot);
// TODO: function for this // TODO: function for this
genericTxd = CTxdStore::GetSlot(slot)->texDict; genericTxd = CTxdStore::GetSlot(slot)->texDict;
assert(genericTxd);
if(defaultFindCB == nil) if(defaultFindCB == nil)
defaultFindCB = rw::Texture::findCB; defaultFindCB = rw::Texture::findCB;
rw::Texture::findCB = customFindCB; rw::Texture::findCB = customFindCB;

5
src/rw/TexRead.cpp
View File

@ -289,6 +289,11 @@ CreateTxdImageForVideoCard()
ConvertingTexturesScreen(i, TXDSTORESIZE, "CVT_MSG"); ConvertingTexturesScreen(i, TXDSTORESIZE, "CVT_MSG");
if (CTxdStore::GetSlot(i) != nil && CStreaming::IsObjectInCdImage(i + STREAM_OFFSET_TXD)) { 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::RequestTxd(i, STREAMFLAGS_KEEP_IN_MEMORY);
CStreaming::RequestModelStream(0); CStreaming::RequestModelStream(0);
CStreaming::FlushChannels(); CStreaming::FlushChannels();