From 7dfb624ee2837ed8d6181bc11bffe682a7ba2a8f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Jul 2014 00:23:00 +0200
Subject: [PATCH] Support loading text keys for objects without a skeleton

This means we can no longer map them to bone IDs, but they are unused anyway.

Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop)
---
 components/nifogre/ogrenifloader.cpp | 6 +-----
 components/nifogre/ogrenifloader.hpp | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 81b2e55d2b..c39c62b67c 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -1038,11 +1038,7 @@ class NIFObjectLoader
             {
                 const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
 
-                if (scene->mSkelBase)
-                {
-                    int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex);
-                    extractTextKeys(tk, scene->mTextKeys[trgtid]);
-                }
+                extractTextKeys(tk, scene->mTextKeys);
             }
             else if(e->recType == Nif::RC_NiStringExtraData)
             {
diff --git a/components/nifogre/ogrenifloader.hpp b/components/nifogre/ogrenifloader.hpp
index badb6ccd3b..011245bea0 100644
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -69,7 +69,7 @@ struct ObjectScene {
     // The maximum length on any of the controllers. For animations with controllers, but no text keys, consider this the animation length.
     float mMaxControllerLength;
 
-    std::map<int,TextKeyMap> mTextKeys;
+    TextKeyMap mTextKeys;
 
     MaterialControllerManager mMaterialControllerMgr;