From a9928bb842bc313d9f199399177f60e2fe4a6532 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 13 May 2013 01:58:13 -0700
Subject: [PATCH] Split up the UpperBody group

Also recognize the [un]equip start and stop text keys.
---
 apps/openmw/mwrender/animation.cpp |  8 +++++++-
 apps/openmw/mwrender/animation.hpp | 13 +++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index dfbaa45090..cf118c9443 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -147,8 +147,9 @@ size_t Animation::detectAnimGroup(const Ogre::Node *node)
 {
     static const char sGroupRoots[sNumGroups][32] = {
         "", /* Lower body / character root */
-        "Bip01 Spine1", /* Upper body */
+        "Bip01 Spine1", /* Torso */
         "Bip01 L Clavicle", /* Left arm */
+        "Bip01 R Clavicle", /* Right arm */
     };
 
     while(node)
@@ -474,6 +475,11 @@ bool Animation::handleTextKey(AnimState &state, const std::string &groupname, co
         return true;
     }
 
+    /* Nothing to do for these */
+    if(evt.compare(off, len, "equip start") == 0 || evt.compare(off, len, "equip stop") == 0 ||
+       evt.compare(off, len, "unequip start") == 0 || evt.compare(off, len, "unequip stop") == 0)
+        return true;
+
     std::cerr<< "Unhandled animation textkey: "<<evt <<std::endl;
     return true;
 }
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 9265dc1eba..012a14360d 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -17,14 +17,19 @@ class Animation
 public:
     enum Group {
         Group_LowerBody = 1<<0,
-        Group_UpperBody = 1<<1,
-        Group_LeftArm = 1<<2,
 
-        Group_All = Group_LowerBody | Group_UpperBody | Group_LeftArm
+        Group_Torso = 1<<1,
+        Group_LeftArm = 1<<2,
+        Group_RightArm = 1<<3,
+
+        Group_UpperBody = Group_Torso | Group_LeftArm | Group_RightArm,
+
+        Group_All = Group_LowerBody | Group_UpperBody
     };
 
 protected:
-    static const size_t sNumGroups = 3;
+    /* This is the number of *discrete* groups. */
+    static const size_t sNumGroups = 4;
 
     class AnimationValue : public Ogre::ControllerValue<Ogre::Real>
     {