AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-26 14:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1014 from Allofich/sounds

Browse Source 
Play locked sounds on locked objects instead of actors
This commit is contained in:
scrawl 2016-08-10 14:45:59 +02:00 committed by GitHub
commit 3925f1fe81
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwclass/container.cpp
View File

@ -190,7 +190,7 @@ namespace MWClass
} }
else else
{ {
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction); boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
action->setSound(lockedSound); action->setSound(lockedSound);
return action; return action;
} }

2
apps/openmw/mwclass/door.cpp
View File

@ -220,7 +220,7 @@ namespace MWClass
else else
{ {
// locked, and we can't open. // locked, and we can't open.
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction); boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
action->setSound(lockedSound); action->setSound(lockedSound);
return action; return action;
} }

4
apps/openmw/mwworld/failedaction.cpp
View File

@ -8,8 +8,8 @@
namespace MWWorld namespace MWWorld
{ {
FailedAction::FailedAction(const std::string &msg) FailedAction::FailedAction(const std::string &msg, const Ptr& target)
: Action(false), mMessage(msg) : Action(false, target), mMessage(msg)
{ } { }
void FailedAction::executeImp(const Ptr &actor) void FailedAction::executeImp(const Ptr &actor)

2
apps/openmw/mwworld/failedaction.hpp
View File

@ -13,7 +13,7 @@ namespace MWWorld
virtual void executeImp(const Ptr &actor); virtual void executeImp(const Ptr &actor);
public: public:
FailedAction(const std::string &message = std::string()); FailedAction(const std::string &message = std::string(), const Ptr& target = Ptr());
}; };
} }