Merge pull request OpenMW#2417 from Capostrophic/switchnode

Use NiSwitchNode initial index field
usmanhf · Jun 9, 2019 · 747b5fb · 747b5fb
2 parents ef2a716 + 7c8360d
commit 747b5fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
@@ -238,10 +238,12 @@ struct NiRotatingParticles : Node
 // A node used as the base to switch between child nodes, such as for LOD levels.
 struct NiSwitchNode : public NiNode
 {
+    unsigned int initialIndex;
+
     void read(NIFStream *nif)
     {
         NiNode::read(nif);
-        nif->getInt(); // unknown
+        initialIndex = nif->getUInt();
     }
 };
 

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
@@ -629,10 +629,8 @@ namespace NifOsg
 
             if (nifNode->recType == Nif::RC_NiSwitchNode)
             {
-                // show only first child by default
-                node->asSwitch()->setSingleChildOn(0);
-
                 const Nif::NiSwitchNode* niSwitchNode = static_cast<const Nif::NiSwitchNode*>(nifNode);
+                node->asSwitch()->setSingleChildOn(niSwitchNode->initialIndex);
                 if (niSwitchNode->name == Constants::NightDayLabel && !SceneUtil::hasUserDescription(rootNode, Constants::NightDayLabel))
                     rootNode->getOrCreateUserDataContainer()->addDescription(Constants::NightDayLabel);
                 else if (niSwitchNode->name == Constants::HerbalismLabel && !SceneUtil::hasUserDescription(rootNode, Constants::HerbalismLabel))