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

various fixes

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-22 17:24:28 +01:00
parent 6643674b13
commit d7af9fbec6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwdialogue/selectwrapper.cpp
View file

@ -6,6 +6,7 @@
#include <stdexcept> #include <stdexcept>
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
#include <iterator>
namespace namespace
{ {

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

@ -9,11 +9,11 @@ namespace MWWorld
{ {
FailedAction::FailedAction (const std::string& msg) : Action (false), message(msg) FailedAction::FailedAction (const std::string& msg) : Action (false), message(msg)
{ } { }
void FailedAction::executeImp (const Ptr& actor) void FailedAction::executeImp (const Ptr& actor)
{ {
if ( actor.getRefData().getHandle()=="player" and !(message.empty())) if ( actor.getRefData().getHandle()=="player" && !(message.empty()))
{ {
MWBase::Environment::get().getWindowManager() ->messageBox(message, std::vector<std::string>()); MWBase::Environment::get().getWindowManager() ->messageBox(message, std::vector<std::string>());
} }