mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 22:40:12 +00:00
Code Issues 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
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
action->setSound(lockedSound);
return action;
}

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

@ -220,7 +220,7 @@ namespace MWClass
else
{
// 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);
return action;
}

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

@ -8,8 +8,8 @@
namespace MWWorld
{
FailedAction::FailedAction(const std::string &msg)
: Action(false), mMessage(msg)
FailedAction::FailedAction(const std::string &msg, const Ptr& target)
: Action(false, target), mMessage(msg)
{ }
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);
public:
FailedAction(const std::string &message = std::string());
FailedAction(const std::string &message = std::string(), const Ptr& target = Ptr());
};
}