teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Play locked sounds on locked objects instead of actors

Browse source
This commit is contained in:
Allofich 2016-08-10 21:02:17 +09:00
parent 6b45a757a9
commit cb9bb92b26
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());
}; };
} }