Play trap activation sound on trapped object, not actor

Fiona-J-W · Jul 10, 2016 · d4e656c · d4e656c
1 parent 251ba04
commit d4e656c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
@@ -173,7 +173,7 @@ namespace MWClass
             else
             {
                 // Activate trap
-                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(actor, ptr.getCellRef().getTrap(), ptr));
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }

diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
@@ -139,7 +139,7 @@ namespace MWClass
             if(!ptr.getCellRef().getTrap().empty())
             {
                 // Trap activation
-                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(actor, ptr.getCellRef().getTrap(), ptr));
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }

diff --git a/apps/openmw/mwworld/actiontrap.hpp b/apps/openmw/mwworld/actiontrap.hpp
@@ -18,10 +18,9 @@ namespace MWWorld
         public:
 
             /// @param spellId
-            /// @param actor Actor that activated the trap
             /// @param trapSource
-            ActionTrap (const Ptr& actor, const std::string& spellId, const Ptr& trapSource)
-                : Action(false, actor), mSpellId(spellId), mTrapSource(trapSource) {}
+            ActionTrap (const std::string& spellId, const Ptr& trapSource)
+                : Action(false, trapSource), mSpellId(spellId), mTrapSource(trapSource) {}
     };
 }