Exception handling improvements (Bug #3090)

apps/openmw/mwmechanics/summoning.cpp

@@ -34,7 +34,7 @@ namespace MWMechanics
                 MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
                     "", ptr.getRefData().getPosition().asVec3());
         }
-        else
+        else if (creatureActorId != -1)
         {
             // We didn't find the creature. It's probably in an inactive cell.
             // Add to graveyard so we can delete it when the cell becomes active.
@@ -132,6 +132,9 @@ namespace MWMechanics
                 if (!creatureID.empty())
                 {
                     MWWorld::CellStore* store = mActor.getCell();
+                    int creatureActorId = -1;
+                    try
+                    {
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), creatureID, 1);
                         ref.getPtr().getCellRef().setPosition(ipos);
 
@@ -140,7 +143,7 @@ namespace MWMechanics
                         // Make the summoned creature follow its master and help in fights
                         AiFollow package(mActor.getCellRef().getRefId());
                         summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
-                    int creatureActorId = summonedCreatureStats.getActorId();
+                        creatureActorId = summonedCreatureStats.getActorId();
 
                         MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
 
@@ -152,6 +155,12 @@ namespace MWMechanics
                             if (fx)
                                 anim->addEffect("meshes\\" + fx->mModel, -1, false);
                         }
+                    }
+                    catch (std::exception& e)
+                    {
+                        std::cerr << "Failed to spawn summoned creature: " << e.what() << std::endl;
+                        // still insert into creatureMap so we don't try to spawn again every frame, that would spam the warning log
+                    }
 
                     creatureMap.insert(std::make_pair(*it, creatureActorId));
                 }

apps/openmw/mwrender/animation.cpp

@@ -518,8 +518,17 @@ namespace MWRender
         }
 
         if (mTextKeyListener)
+        {
+            try
+            {
                 mTextKeyListener->handleTextKey(groupname, key, map);
             }
+            catch (std::exception& e)
+            {
+                std::cerr << "Error handling text key " << evt << ": " << e.what() << std::endl;
+            }
+        }
+    }
 
     void Animation::play(const std::string &groupname, const AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
                          const std::string &start, const std::string &stop, float startpoint, size_t loops, bool loopfallback)