From 6c9875969a5e0a12bb427b79cad7d2dc65e0256e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 28 Dec 2014 15:34:47 +0100
Subject: [PATCH] Stop idle animations for non-biped creatures when
 attacking/moving

The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
---
 apps/openmw/mwclass/npc.cpp           | 5 +++++
 apps/openmw/mwclass/npc.hpp           | 2 ++
 apps/openmw/mwmechanics/character.cpp | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 3fe23772d..30445612a 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1384,4 +1384,9 @@ namespace MWClass
         MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
         return ref->mBase->mAiData.mFight;
     }
+
+    bool Npc::isBipedal(const MWWorld::Ptr &ptr) const
+    {
+        return true;
+    }
 }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 3bc450088..8c89686af 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -182,6 +182,8 @@ namespace MWClass
                 return true;
             }
 
+            virtual bool isBipedal (const MWWorld::Ptr &ptr) const;
+
             virtual void respawn (const MWWorld::Ptr& ptr) const;
 
             virtual void restock (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 633573ad9..23ff9afff 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1586,7 +1586,14 @@ void CharacterController::update(float duration)
             clearAnimQueue();
 
         if(mAnimQueue.empty())
+        {
             idlestate = (inwater ? CharState_IdleSwim : (sneak ? CharState_IdleSneak : CharState_Idle));
+            if ((mUpperBodyState != UpperCharState_Nothing
+                    || mMovementState != CharState_None
+                    || mHitState != CharState_None)
+                    && !mPtr.getClass().isBipedal(mPtr))
+                idlestate = CharState_None;
+        }
         else if(mAnimQueue.size() > 1)
         {
             if(mAnimation->isPlaying(mAnimQueue.front().first) == false)