diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp index 0ebf6491d..28c292dfe 100644 --- a/apps/openmw/mwclass/container.cpp +++ b/apps/openmw/mwclass/container.cpp @@ -130,7 +130,7 @@ namespace MWClass { // Trap activation goes here std::cout << "Activated trap: " << ptr.getCellRef().mTrap << std::endl; - boost::shared_ptr action(new MWWorld::FailedAction()); + boost::shared_ptr action(new MWWorld::FailedAction); action->setSound(trapActivationSound); ptr.getCellRef().mTrap = ""; return action; @@ -138,7 +138,7 @@ namespace MWClass } else { - boost::shared_ptr action(new MWWorld::FailedAction()); + boost::shared_ptr action(new MWWorld::FailedAction); action->setSound(lockedSound); return action; } diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp index 63bd8fba0..f9a135f37 100644 --- a/apps/openmw/mwclass/door.cpp +++ b/apps/openmw/mwclass/door.cpp @@ -112,7 +112,7 @@ namespace MWClass // Trap activation std::cout << "Activated trap: " << ptr.getCellRef().mTrap << std::endl; - boost::shared_ptr action(new MWWorld::FailedAction()); + boost::shared_ptr action(new MWWorld::FailedAction); action->setSound(trapActivationSound); ptr.getCellRef().mTrap = ""; @@ -134,7 +134,7 @@ namespace MWClass else { // another NPC or a creature is using the door - return boost::shared_ptr (new MWWorld::FailedAction()); + return boost::shared_ptr (new MWWorld::FailedAction); } } else @@ -153,7 +153,7 @@ namespace MWClass else { // locked, and we can't open. - boost::shared_ptr action(new MWWorld::FailedAction()); + boost::shared_ptr action(new MWWorld::FailedAction); action->setSound(lockedSound); return action; } diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp index 7af31cc2c..71dfe683e 100644 --- a/apps/openmw/mwclass/light.cpp +++ b/apps/openmw/mwclass/light.cpp @@ -93,7 +93,7 @@ namespace MWClass ptr.get(); if (!(ref->base->mData.mFlags & ESM::Light::Carry)) - return boost::shared_ptr (new MWWorld::FailedAction()); + return boost::shared_ptr (new MWWorld::FailedAction); boost::shared_ptr action(new MWWorld::ActionTake (ptr)); diff --git a/apps/openmw/mwworld/failedaction.cpp b/apps/openmw/mwworld/failedaction.cpp index 78842820b..8c64db69f 100644 --- a/apps/openmw/mwworld/failedaction.cpp +++ b/apps/openmw/mwworld/failedaction.cpp @@ -1,24 +1,21 @@ #include "failedaction.hpp" #include "../mwbase/world.hpp" +#include "../mwbase/environment.hpp" +#include "../mwbase/windowmanager.hpp" + namespace MWWorld { - FailedAction::FailedAction (const std::string& msg) : Action (false) - { - message = msg; - } + FailedAction::FailedAction (const std::string& msg) : Action (false), message(msg) + { } - FailedAction::FailedAction () : Action (false) - { - - } void FailedAction::executeImp (const Ptr& actor) { - if ( actor.getRefData().getHandle()=="player" and not(message.empty())) + if ( actor.getRefData().getHandle()=="player" and !(message.empty())) { - //return a message here + MWBase::Environment::get().getWindowManager() ->messageBox(message, std::vector()); } } } diff --git a/apps/openmw/mwworld/failedaction.hpp b/apps/openmw/mwworld/failedaction.hpp index 21df65c48..e736bfb63 100644 --- a/apps/openmw/mwworld/failedaction.hpp +++ b/apps/openmw/mwworld/failedaction.hpp @@ -13,8 +13,7 @@ namespace MWWorld virtual void executeImp (const Ptr& actor); public: - FailedAction (const std::string& message); - FailedAction (); + FailedAction (const std::string& message = std::string()); }; }