From d2ed77f3f28e8eadb9cf29d312572d921e91b17e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 23 Nov 2013 20:24:52 +0100
Subject: [PATCH] Fix shields being visible during spellcasting

---
 apps/openmw/mwmechanics/character.cpp |  6 ++++++
 apps/openmw/mwrender/animation.hpp    |  1 +
 apps/openmw/mwrender/npcanimation.cpp | 30 +++++++++++++++++++++++++++
 apps/openmw/mwrender/npcanimation.hpp |  2 ++
 4 files changed, 39 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c7a6b3875..7505d3405 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -426,6 +426,11 @@ bool CharacterController::updateNpcState(bool onground, bool inwater, bool isrun
     {
         forcestateupdate = true;
 
+        // Shields shouldn't be visible during spellcasting
+        // There seems to be no text keys for this purpose, except maybe for "[un]equip start/stop",
+        // but they are also present in weapon drawing animation.
+        mAnimation->showShield(weaptype != WeapType_Spell);
+
         std::string weapgroup;
         if(weaptype == WeapType_None)
         {
@@ -443,6 +448,7 @@ bool CharacterController::updateNpcState(bool onground, bool inwater, bool isrun
                              MWRender::Animation::Group_UpperBody, true,
                              1.0f, "equip start", "equip stop", 0.0f, 0);
             mUpperBodyState = UpperCharState_EquipingWeap;
+
             if(isWerewolf)
             {
                 const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 38e7742ef..e28aecbc1 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -274,6 +274,7 @@ public:
     virtual Ogre::Vector3 runAnimation(float duration);
 
     virtual void showWeapons(bool showWeapon);
+    virtual void showShield(bool show) {}
 
     void enableLights(bool enable);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index e219bcf42..50e41062a 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -110,6 +110,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int v
     mListenerDisabled(disableListener),
     mViewMode(viewMode),
     mShowWeapons(false),
+    mShowShield(true),
     mFirstPersonOffset(0.f, 0.f, 0.f)
 {
     mNpc = mPtr.get<ESM::NPC>()->mBase;
@@ -307,6 +308,7 @@ void NpcAnimation::updateParts()
     }
 
     showWeapons(mShowWeapons);
+    showShield(mShowShield);
 
     // Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
     static std::map< std::pair<std::string,int>,std::vector<const ESM::BodyPart*> > sRaceMapping;
@@ -635,6 +637,34 @@ void NpcAnimation::showWeapons(bool showWeapon)
     }
 }
 
+void NpcAnimation::showShield(bool show)
+{
+    mShowShield = show;
+    MWWorld::InventoryStore &inv = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
+    MWWorld::ContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+
+    if (shield != inv.end() && shield->getTypeName() == typeid(ESM::Light).name())
+    {
+        // ... Except for lights, which are still shown during spellcasting since they
+        // have their own (one-handed) casting animations
+        show = true;
+    }
+    if(show && shield != inv.end())
+    {
+        Ogre::Vector3 glowColor = getEnchantmentColor(*shield);
+        std::string mesh = MWWorld::Class::get(*shield).getModel(*shield);
+        addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
+                                   mesh, !shield->getClass().getEnchantment(*shield).empty(), &glowColor);
+
+        if (shield->getTypeName() == typeid(ESM::Light).name())
+            addExtraLight(mInsert->getCreator(), mObjectParts[ESM::PRT_Shield], shield->get<ESM::Light>()->mBase);
+    }
+    else
+    {
+        removeIndividualPart(ESM::PRT_Shield);
+    }
+}
+
 void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound)
 {
     // During first auto equip, we don't play any sounds.
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 7116b6ef1..c33d511ec 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -41,6 +41,7 @@ private:
     std::string    mHairModel;
     ViewMode       mViewMode;
     bool mShowWeapons;
+    bool mShowShield;
 
     int mVisibilityFlags;
 
@@ -81,6 +82,7 @@ public:
     virtual Ogre::Vector3 runAnimation(float timepassed);
 
     virtual void showWeapons(bool showWeapon);
+    virtual void showShield(bool showShield);
 
     void setViewMode(ViewMode viewMode);