From d6d9df6cec4c3c5e1dc02bc756f4174243caff56 Mon Sep 17 00:00:00 2001
From: mrcheko <cheko@sevas.ua>
Date: Wed, 11 Jun 2014 00:20:46 +0400
Subject: [PATCH] split getStartTime

---
 apps/openmw/mwmechanics/aicombat.cpp     | 12 ++++++--
 apps/openmw/mwrender/animation.cpp       | 35 ++++++++++++++----------
 apps/openmw/mwrender/animation.hpp       |  5 +++-
 apps/openmw/mwrender/weaponanimation.cpp |  2 +-
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 2218623da7..4a3c724d59 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -785,15 +785,21 @@ void getMinMaxAttackDuration(const MWWorld::Ptr& actor, float (*fMinMaxDurations
     // get durations for each attack type
     for (int i = 0; i < (bRangedWeap ? 1 : 3); i++)
     {
-        float start1 = anim->getStartTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey, false);
+        float start1 = anim->getTextKeyTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey);
+
+        if (start1 < 0) 
+        {
+            fMinMaxDurations[i][0] = fMinMaxDurations[i][1] = 0.1f;
+            continue;
+        }
 
         textKey2 = "min attack";
-        float start2 = anim->getStartTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey2, false);
+        float start2 = anim->getTextKeyTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey2);
 
         fMinMaxDurations[i][0] = (start2 - start1) / weapSpeed;
 
         textKey2 = "max attack";
-        start1 = anim->getStartTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey2, false);
+        start1 = anim->getTextKeyTime(weapGroup + (bRangedWeap ? attackType[3] : attackType[i]) + textKey2);
 
         fMinMaxDurations[i][1] = fMinMaxDurations[i][0] + (start1 - start2) / weapSpeed;
     }
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 6c27465577..1c86fab891 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -903,27 +903,32 @@ bool Animation::getInfo(const std::string &groupname, float *complete, float *sp
     return true;
 }
 
-float Animation::getStartTime(const std::string &groupname, bool onlyGroup) const
+float Animation::getStartTime(const std::string &groupname) const
 {
-    AnimSourceList::const_iterator iter(mAnimSources.begin());
-    for(;iter != mAnimSources.end();iter++)
+    for(AnimSourceList::const_iterator iter(mAnimSources.begin()); iter != mAnimSources.end(); ++iter)
     {
         const NifOgre::TextKeyMap &keys = (*iter)->mTextKeys;
-        if (onlyGroup)
+
+        NifOgre::TextKeyMap::const_iterator found = findGroupStart(keys, groupname);
+        if(found != keys.end())
+            return found->first;
+    }
+    return -1.f;
+}
+
+float Animation::getTextKeyTime(const std::string &textKey) const
+{
+    for(AnimSourceList::const_iterator iter(mAnimSources.begin()); iter != mAnimSources.end(); ++iter)
+    {
+        const NifOgre::TextKeyMap &keys = (*iter)->mTextKeys;
+
+        for(NifOgre::TextKeyMap::const_iterator iterKey(keys.begin()); iterKey != keys.end(); ++iterKey)
         {
-            NifOgre::TextKeyMap::const_iterator found = findGroupStart(keys, groupname);
-            if(found != keys.end())
-                return found->first;
-        }
-        else
-        {
-            for(NifOgre::TextKeyMap::const_iterator iter(keys.begin()); iter != keys.end(); ++iter)
-            {
-                if(iter->second.compare(0, groupname.size(), groupname) == 0)
-                    return iter->first;
-            }
+            if(iterKey->second.compare(0, textKey.size(), textKey) == 0)
+                return iterKey->first;
         }
     }
+
     return -1.f;
 }
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 2fc57f0e91..b2d69b79a4 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -275,7 +275,10 @@ public:
     bool getInfo(const std::string &groupname, float *complete=NULL, float *speedmult=NULL) const;
 
     /// Get the absolute position in the animation track of the first text key with the given group.
-    float getStartTime(const std::string &groupname, bool onlyGroup) const;
+    float getStartTime(const std::string &groupname) const;
+
+    /// Get the absolute position in the animation track of the text key
+    float getTextKeyTime(const std::string &textKey) const;
 
     /// Get the current absolute position in the animation track for the animation that is currently playing from the given group.
     float getCurrentTime(const std::string& groupname) const;
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 3d4886ceac..5f953bd838 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -32,7 +32,7 @@ float WeaponAnimationTime::getValue() const
 void WeaponAnimationTime::setGroup(const std::string &group)
 {
     mWeaponGroup = group;
-    mStartTime = mAnimation->getStartTime(mWeaponGroup, true);
+    mStartTime = mAnimation->getStartTime(mWeaponGroup);
 }
 
 void WeaponAnimationTime::updateStartTime()