Fixed|Client: Avoid crash when save contains animator state

If an object being loaded does not have a 3D model animator, but the savegame does, the animator state should be read but discarded. Previously it was just trying to read into a nullptr, causing a crash.
skyjake · Oct 20, 2018 · ad296ce · ad296ce
1 parent f6b3a41
commit ad296ce
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/doomsday/apps/client/include/render/stateanimator.h b/doomsday/apps/client/include/render/stateanimator.h
@@ -49,6 +49,7 @@ class StateAnimator : public de::ModelDrawable::Animator,
     DENG2_ERROR(DefinitionError);
 
 public:
+    StateAnimator();
     StateAnimator(de::DotPath const &id, Model const &model);
 
     Model const &model() const;

diff --git a/doomsday/apps/client/src/render/stateanimator.cpp b/doomsday/apps/client/src/render/stateanimator.cpp
@@ -202,24 +202,27 @@ DENG2_PIMPL(StateAnimator)
 
     Impl(Public *i, DotPath const &assetId) : Base(i)
     {
-        initVariables(assetId);
-
-        // Set up the model drawing parameters.
-        if (!self().model().passes.isEmpty())
+        if (!assetId.isEmpty())
         {
-            appearance.drawPasses = &self().model().passes;
+            initVariables(assetId);
+
+            // Set up the model drawing parameters.
+            if (!self().model().passes.isEmpty())
+            {
+                appearance.drawPasses = &self().model().passes;
+            }
+            appearance.programCallback = [this] (GLProgram &program, ModelDrawable::ProgramBinding binding)
+            {
+                bindUniforms(program,
+                    binding == ModelDrawable::AboutToBind? Bind : Unbind);
+            };
+            appearance.passCallback = [this] (ModelDrawable::Pass const &pass, ModelDrawable::PassState state)
+            {
+                bindPassUniforms(*self().model().currentProgram(),
+                    pass.name,
+                    state == ModelDrawable::PassBegun? Bind : Unbind);
+            };
         }
-        appearance.programCallback = [this] (GLProgram &program, ModelDrawable::ProgramBinding binding)
-        {
-            bindUniforms(program,
-                binding == ModelDrawable::AboutToBind? Bind : Unbind);
-        };
-        appearance.passCallback = [this] (ModelDrawable::Pass const &pass, ModelDrawable::PassState state)
-        {
-            bindPassUniforms(*self().model().currentProgram(),
-                pass.name,
-                state == ModelDrawable::PassBegun? Bind : Unbind);
-        };
     }
 
     ~Impl()
@@ -575,6 +578,11 @@ DENG2_PIMPL(StateAnimator)
     }
 };
 
+StateAnimator::StateAnimator()
+    : ModelDrawable::Animator(Impl::Sequence::make)
+    , d(new Impl(this, {}))
+{}
+
 StateAnimator::StateAnimator(DotPath const &id, Model const &model)
     : ModelDrawable::Animator(model, Impl::Sequence::make)
     , d(new Impl(this, id))

diff --git a/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp b/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp
@@ -333,7 +333,15 @@ void ClientMobjThinkerData::operator << (Reader &from)
     if (flags & Impl::HasAnimator) // Animator
     {
         d->initOnce();
-        from >> *d->animator;
+        if (d->animator)
+        {
+            from >> *d->animator;
+        }
+        else
+        {
+            render::StateAnimator temp;
+            from >> temp; // Not used.
+        }
     }
 }