From 940a90e3baac2f924bcd1fba0de672c9b74a2717 Mon Sep 17 00:00:00 2001
From: Jason Hooks <jhooks1@mix.wvu.edu>
Date: Sat, 14 Apr 2012 19:21:14 -0400
Subject: [PATCH] Pauldrons

---
 apps/openmw/mwrender/npcanimation.cpp | 26 +++++++++++++++++++++++++-
 apps/openmw/mwrender/npcanimation.hpp |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index bacee7f2db..5adb9914dd 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -15,6 +15,7 @@ NpcAnimation::~NpcAnimation(){
 NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv): Animation(_env,_rend), mStateID(-1), inv(_inv), timeToChange(0), 
     robe(inv.getSlot(MWWorld::InventoryStore::Slot_Robe)), helmet(inv.getSlot(MWWorld::InventoryStore::Slot_Helmet)), shirt(inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)),
     cuirass(inv.getSlot(MWWorld::InventoryStore::Slot_Cuirass)), greaves(inv.getSlot(MWWorld::InventoryStore::Slot_Greaves)),
+    leftpauldron(inv.getSlot(MWWorld::InventoryStore::Slot_LeftPauldron)), rightpauldron(inv.getSlot(MWWorld::InventoryStore::Slot_RightPauldron)),
     lclavicle(0),
 	rclavicle(0),
 	rupperArm(0),
@@ -185,9 +186,20 @@ void NpcAnimation::updateParts(){
             
         }
         if(greaves != inv.getSlot(MWWorld::InventoryStore::Slot_Greaves)){
-            cuirass = inv.getSlot(MWWorld::InventoryStore::Slot_Greaves);
+            greaves = inv.getSlot(MWWorld::InventoryStore::Slot_Greaves);
             removePartGroup(MWWorld::InventoryStore::Slot_Greaves);
             apparelChanged = true;
+        }
+        if(leftpauldron != inv.getSlot(MWWorld::InventoryStore::Slot_LeftPauldron)){
+            leftpauldron = inv.getSlot(MWWorld::InventoryStore::Slot_LeftPauldron);
+            removePartGroup(MWWorld::InventoryStore::Slot_LeftPauldron);
+            apparelChanged = true;
+            
+        }
+        if(rightpauldron != inv.getSlot(MWWorld::InventoryStore::Slot_RightPauldron)){
+            leftpauldron = inv.getSlot(MWWorld::InventoryStore::Slot_RightPauldron);
+            removePartGroup(MWWorld::InventoryStore::Slot_RightPauldron);
+            apparelChanged = true;
             
         }
         if(shirt != inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)){
@@ -225,6 +237,18 @@ void NpcAnimation::updateParts(){
                 std::vector<ESM::PartReference> parts = armor->parts.parts;
                 addPartGroup(MWWorld::InventoryStore::Slot_Greaves, 3, parts);
                 
+            }
+             if(leftpauldron != inv.end()){
+                const ESM::Armor *armor = (leftpauldron->get<ESM::Armor>())->base;
+                std::vector<ESM::PartReference> parts = armor->parts.parts;
+                addPartGroup(MWWorld::InventoryStore::Slot_LeftPauldron, 3, parts);
+                
+            }
+             if(rightpauldron != inv.end()){
+                const ESM::Armor *armor = (rightpauldron->get<ESM::Armor>())->base;
+                std::vector<ESM::PartReference> parts = armor->parts.parts;
+                addPartGroup(MWWorld::InventoryStore::Slot_RightPauldron, 3, parts);
+                
             }
              if(shirt != inv.end()){
                 const ESM::Clothing *clothes = (shirt->get<ESM::Clothing>())->base;
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 545634e1fe..7785ffc1a0 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -73,6 +73,8 @@ private:
     MWWorld::ContainerStoreIterator shirt;
     MWWorld::ContainerStoreIterator cuirass;
     MWWorld::ContainerStoreIterator greaves;
+    MWWorld::ContainerStoreIterator leftpauldron;
+    MWWorld::ContainerStoreIterator rightpauldron;
     
     public:
      NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv);