From 63ab856024abb36401da58744f9f5fe40063c908 Mon Sep 17 00:00:00 2001
From: dteviot <dteviot@gmail.co.nz>
Date: Mon, 23 Mar 2015 20:57:36 +1300
Subject: [PATCH] Removed duplicated code.

---
 apps/openmw/mwmechanics/aiwander.cpp | 56 ++++++++++++----------------
 apps/openmw/mwmechanics/aiwander.hpp |  8 ++++
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 2bd2cfe5d..d277b1249 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -31,6 +31,18 @@ namespace MWMechanics
     static const int GREETING_SHOULD_START = 4; //how many reaction intervals should pass before NPC can greet player
     static const int GREETING_SHOULD_END = 10;
 
+    const std::string AiWander::sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1] =
+    {
+        std::string("idle2"),
+        std::string("idle3"),
+        std::string("idle4"),
+        std::string("idle5"),
+        std::string("idle6"),
+        std::string("idle7"),
+        std::string("idle8"),
+        std::string("idle9"),
+    };
+
     /// \brief This class holds the variables AiWander needs which are deleted if the package becomes inactive.
     struct AiWanderStorage : AiTemporaryBase
     {
@@ -580,44 +592,24 @@ namespace MWMechanics
 
     void AiWander::playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect)
     {
-        if(idleSelect == 2)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle2", 0, 1);
-        else if(idleSelect == 3)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
-        else if(idleSelect == 4)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle4", 0, 1);
-        else if(idleSelect == 5)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle5", 0, 1);
-        else if(idleSelect == 6)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle6", 0, 1);
-        else if(idleSelect == 7)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle7", 0, 1);
-        else if(idleSelect == 8)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle8", 0, 1);
-        else if(idleSelect == 9)
-            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle9", 0, 1);
+        if ((GroupIndex_MinIdle <= idleSelect) && (idleSelect <= GroupIndex_MaxIdle))
+        {
+            const std::string& groupName = sIdleSelectToGroupName[idleSelect - GroupIndex_MinIdle];
+            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, groupName, 0, 1);
+        }
     }
 
     bool AiWander::checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect)
     {
-        if(idleSelect == 2)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle2");
-        else if(idleSelect == 3)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle3");
-        else if(idleSelect == 4)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle4");
-        else if(idleSelect == 5)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle5");
-        else if(idleSelect == 6)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle6");
-        else if(idleSelect == 7)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle7");
-        else if(idleSelect == 8)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle8");
-        else if(idleSelect == 9)
-            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, "idle9");
+        if ((GroupIndex_MinIdle <= idleSelect) && (idleSelect <= GroupIndex_MaxIdle))
+        {
+            const std::string& groupName = sIdleSelectToGroupName[idleSelect - GroupIndex_MinIdle];
+            return MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(actor, groupName);
+        }
         else
+        {
             return false;
+        }
     }
 
     void AiWander::setReturnPosition(const Ogre::Vector3& position)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 54e215cb9..7e138c001 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -113,7 +113,15 @@ namespace MWMechanics
             float mDoorCheckDuration;
             int mStuckCount;
 
+            // constants for converting idleSelect values into groupNames
+            enum GroupIndex
+            {
+                GroupIndex_MinIdle = 2,
+                GroupIndex_MaxIdle = 9
+            };
 
+            /// lookup table for converting idleSelect value to groupName
+            static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
     };