From e5a81b1f99bb6e23fb633c3fb03cb5145ba352aa Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 8 Sep 2018 18:17:11 +0400
Subject: [PATCH] Fix some issues, found by Coverity Scan

---
 apps/openmw/mwmechanics/character.cpp |  4 +++-
 apps/openmw/mwrender/animation.cpp    |  1 +
 apps/openmw/mwworld/worldimp.cpp      | 12 +++++++++---
 components/debug/debugging.hpp        |  2 --
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index fddd351fa6..69916b37af 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2145,9 +2145,11 @@ void CharacterController::update(float duration)
         if (isTurning())
         {
             // Adjust animation speed from 1.0 to 1.5 multiplier
-            float turnSpeed = std::min(1.5f, std::abs(rot.z()) / duration / static_cast<float>(osg::PI));
             if (duration > 0)
+            {
+                float turnSpeed = std::min(1.5f, std::abs(rot.z()) / duration / static_cast<float>(osg::PI));
                 mAnimation->adjustSpeedMult(mCurrentMovement, std::max(turnSpeed, 1.0f));
+            }
         }
         else if (mMovementState != CharState_None && mAdjustMovementAnimSpeed)
         {
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 1ace2f8b4b..7410dbf037 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -219,6 +219,7 @@ namespace
 
         RemoveFinishedCallbackVisitor(int effectId)
             : RemoveVisitor()
+            , mHasMagicEffects(false)
             , mEffectId(effectId)
         {
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 48cb1dda3c..9e08a25637 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1159,11 +1159,17 @@ namespace MWWorld
 
         osg::Vec3f vec(x, y, z);
 
-        CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL; // currCell == NULL should only happen for player, during initial startup
+        CellStore *currCell = ptr.isInCell() ? ptr.getCell() : nullptr; // currCell == nullptr should only happen for player, during initial startup
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = isPlayer || (currCell && mWorldScene->isCellActive(*currCell));
         MWWorld::Ptr newPtr = ptr;
 
+        if (!isPlayer && !currCell)
+           throw std::runtime_error("Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: current cell is nullptr");
+
+        if (!newCell)
+           throw std::runtime_error("Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: new cell is nullptr");
+
         if (currCell != newCell)
         {
             removeContainerScripts(ptr);
@@ -1185,10 +1191,10 @@ namespace MWWorld
                 addContainerScripts (getPlayerPtr(), newCell);
                 newPtr = getPlayerPtr();
             }
-            else if (currCell)
+            else
             {
                 bool currCellActive = mWorldScene->isCellActive(*currCell);
-                bool newCellActive = newCell && mWorldScene->isCellActive(*newCell);
+                bool newCellActive = mWorldScene->isCellActive(*newCell);
                 if (!currCellActive && newCellActive)
                 {
                     newPtr = currCell->moveTo(ptr, newCell);
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index 59536d685c..f47f58e451 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -41,8 +41,6 @@ namespace Debug
         {
             return size;
         }
-
-        char mDebugLevel;
     };
 
 #if defined(_WIN32) && defined(_DEBUG)