Merge pull request #17 from Deamon87/development

Fix Split Group loading
Deamon87 · Oct 8, 2022 · 81b9bf7 · 81b9bf7
2 parents b667db7 + 0878312
commit 81b9bf7
Show file tree

Hide file tree

Showing 3 changed files with 512 additions and 510 deletions.
diff --git a/3rdparty/casclib b/3rdparty/casclib
diff --git a/wowViewerLib/src/engine/objects/wmo/wmoObject.cpp b/wowViewerLib/src/engine/objects/wmo/wmoObject.cpp
@@ -937,8 +937,10 @@ void WmoObject::addSplitChildWMOsToView(InteriorView &interiorView, int groupId)
     int nextChildGroupIndex = parentMogp->parentSplitOrFirstChildGroupIndex;
     while (nextChildGroupIndex != -1) {
         auto &groupWmo = groupObjects[nextChildGroupIndex];
-        if (!groupWmo->getIsLoaded())
+        if (!groupWmo->getIsLoaded()) {
+            interiorView.wmoGroupArray.addToLoad(groupWmo);
             return;
+        }
 
         auto &mogp = groupWmo->getWmoGroupGeom()->mogp;
         if (!mogp->flags2.isSplitGroupChild)
+17 −1		CascLib_vs19.vcxproj
+5 −1		CascLib_vs19_dll.vcxproj
+5 −1		CascLib_vs19_test.vcxproj
+4 −4		make-msvc.bat
+7 −2		src/CascCommon.h
+159 −87		src/CascFiles.cpp
+3 −1		src/CascLib.h
+42 −8		src/CascOpenStorage.cpp
+4 −0		src/CascPort.h
+20 −19		src/CascReadFile.cpp
+53 −20		src/CascRootFile_TVFS.cpp
+1 −1		src/common/Array.h
+10 −1		src/common/Common.h
+26 −15		src/common/FileStream.cpp
+11 −8		src/common/Mime.cpp
+7 −8		src/common/Mime.h
+14 −2		src/common/Path.h
+38 −1		src/common/RootHandler.cpp
+24 −0		src/common/RootHandler.h
+50 −13		src/common/Sockets.cpp
+67 −16		test/CascTest.cpp
+271 −0		test/casclib-test-001.txt
+271 −0		test/casclib-test-002.txt
+278 −0		test/casclib-test-003.txt
+330 −0		test/casclib-test-004.txt
+0 −0		test/casclib-test-005.txt
+345 −0		test/casclib-test-006.txt