From 4890d901a28ff26c93fcc9a7c16f3ee2d9751718 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 12 Jan 2013 08:49:08 -0800
Subject: [PATCH] Store an MWWorld::Ptr in the character controller

---
 apps/openmw/mwmechanics/actors.cpp    | 2 +-
 apps/openmw/mwmechanics/character.hpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a7e8f0db1..aa5119dba 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -166,7 +166,7 @@ namespace MWMechanics
     void Actors::addActor (const MWWorld::Ptr& ptr)
     {
         if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead())
-            mActors[ptr] = CharacterController();
+            mActors.insert(std::make_pair(ptr, CharacterController(ptr)));
         else
             MWBase::Environment::get().getWorld()->playAnimationGroup (ptr, "death1", 2);
     }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index c7638970d..1b5320375 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -1,12 +1,19 @@
 #ifndef GAME_MWMECHANICS_CHARACTER_HPP
 #define GAME_MWMECHANICS_CHARACTER_HPP
 
+#include "../mwworld/ptr.hpp"
+
 namespace MWMechanics
 {
 
 class CharacterController
 {
+    MWWorld::Ptr mPtr;
 
+public:
+    CharacterController(const MWWorld::Ptr &ptr)
+      : mPtr(ptr)
+    { }
 };
 
 }