mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 11:41:33 +00:00
Code Issues 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
{ {

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

@ -13,7 +13,7 @@ namespace MWWorld
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>());
} }