From 7e5ddae3b3377ecf489dc68b76e4f70de049cedf Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 3 Aug 2010 18:22:01 +0200
Subject: [PATCH] modified action interface to allow other actors besides the
 player

---
 apps/openmw/mwworld/class.cpp | 2 +-
 apps/openmw/mwworld/class.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 9a6a73a87..02859a7c8 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -29,7 +29,7 @@ namespace MWWorld
         throw std::runtime_error ("class does not have item health");
     }
 
-    boost::shared_ptr<Action> Class::activate (const Ptr& ptr) const
+    boost::shared_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
     {
         return boost::shared_ptr<Action> (new NullAction);
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 8287284c0..55efbcc53 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -49,7 +49,7 @@ namespace MWWorld
             ///< Return item max health or throw an exception, if class does not have item health
             /// (default implementation: throw an exceoption)
 
-            virtual boost::shared_ptr<Action> activate (const Ptr& ptr) const;
+            virtual boost::shared_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
             ///< Generate action for activation (default implementation: return a null action).
 
             virtual boost::shared_ptr<Action> use (const Ptr& ptr) const;