getHitContact Head exception fix

apps/openmw/mwmechanics/character.cpp

@@ -1158,10 +1158,10 @@ bool CharacterController::updateWeaponState()
                     effect = store.get<ESM::MagicEffect>().find(effectentry.mEffectID);
 
                     const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Hands");
-                    if (mAnimation->hasNode("Bip01 L Hand"))
+                    if (mAnimation->getNode("Bip01 L Hand"))
                         mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 L Hand", effect->mParticle);
 
-                    if (mAnimation->hasNode("Bip01 R Hand"))
+                    if (mAnimation->getNode("Bip01 R Hand"))
                         mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 R Hand", effect->mParticle);
 
                     switch(effectentry.mRange)

apps/openmw/mwrender/animation.cpp

@@ -1136,19 +1136,14 @@ namespace MWRender
         return true;
     }
 
-    bool Animation::hasNode(const std::string &name) const
-    {
-        std::string lowerName = Misc::StringUtils::lowerCase(name);
-        return (mNodeMap.find(lowerName) != mNodeMap.end());
-    }
-
     const osg::Node* Animation::getNode(const std::string &name) const
     {
         std::string lowerName = Misc::StringUtils::lowerCase(name);
         NodeMap::const_iterator found = mNodeMap.find(lowerName);
         if (found == mNodeMap.end())
-            throw std::runtime_error("Can't find node " + name);
-        return found->second;
+            return NULL;
+        else
+            return found->second;
     }
 
     float Animation::AnimationTime::getValue(osg::NodeVisitor*)

apps/openmw/mwrender/animation.hpp

@@ -367,11 +367,7 @@ public:
     /// This is typically called as part of runAnimation, but may be called manually if needed.
     void updateEffects(float duration);
 
-    /// Is there a node with the specified name?
-    /// @note The matching is case-insensitive.
-    bool hasNode(const std::string& name) const;
-
-    /// Return a node with the specified name, throws an exception if the node is not found.
+    /// Return a node with the specified name, or NULL if not existing.
     /// @note The matching is case-insensitive.
     const osg::Node* getNode(const std::string& name) const;
 

apps/openmw/mwrender/characterpreview.cpp

@@ -363,8 +363,13 @@ namespace MWRender
             mCamera->removeUpdateCallback(mUpdateCameraCallback);
 
         const osg::Node* head = mAnimation->getNode("Bip01 Head");
-        mUpdateCameraCallback = new UpdateCameraCallback(head, mPosition, mLookAt);
-        mCamera->addUpdateCallback(mUpdateCameraCallback);
+        if (head)
+        {
+            mUpdateCameraCallback = new UpdateCameraCallback(head, mPosition, mLookAt);
+            mCamera->addUpdateCallback(mUpdateCameraCallback);
+        }
+        else
+            std::cerr << "Error: Bip01 Head node not found" << std::endl;
     }
 
 }