From 895055a3d1538eb10dcb19c182b0a008c26bdce3 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 19 Aug 2020 16:53:11 +0200 Subject: [PATCH] update librw; fix txd.img bug --- src/rw/TexRead.cpp | 5 +++++ vendor/librw | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp index 4087029b..0c07b9f5 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(); diff --git a/vendor/librw b/vendor/librw index a78a0239..93c246b6 160000 --- a/vendor/librw +++ b/vendor/librw @@ -1 +1 @@ -Subproject commit a78a02394e4c528a2ade867dfd0ffe04e32ec474 +Subproject commit 93c246b6b1137dba0cb7ed096b5f6d8ac8e8396f