From 117b812fb1890c559deb3d872f3e3affa48edd60 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 12 May 2014 02:20:56 +0200
Subject: [PATCH] Fix invisibility not breaking on certain actions

---
 apps/openmw/mwgui/hud.cpp             | 3 +++
 apps/openmw/mwgui/inventorywindow.cpp | 4 +++-
 apps/openmw/mwworld/actionapply.cpp   | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index be4a9a14e..ccd4489ba 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -233,6 +233,9 @@ namespace MWGui
 
             MWBase::World* world = MWBase::Environment::get().getWorld();
 
+            MWBase::Environment::get().getWorld()->breakInvisibility(
+                        MWBase::Environment::get().getWorld()->getPlayerPtr());
+
             MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
             MyGUI::IntPoint cursorPosition = MyGUI::InputManager::getInstance().getMousePosition();
             float mouseX = cursorPosition.left / float(viewSize.width);
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 2bea088e3..d6da3b30e 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -541,9 +541,11 @@ namespace MWGui
 
         int count = object.getRefData().getCount();
 
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        MWBase::Environment::get().getWorld()->breakInvisibility(player);
+
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject (object);
diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp
index f78b8f798..bd3e87548 100644
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@@ -3,6 +3,9 @@
 
 #include "class.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 namespace MWWorld
 {
     ActionApply::ActionApply (const Ptr& target, const std::string& id)
@@ -11,6 +14,8 @@ namespace MWWorld
 
     void ActionApply::executeImp (const Ptr& actor)
     {
+        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
+
         MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor);
     }
 
@@ -22,6 +27,8 @@ namespace MWWorld
 
     void ActionApplyWithSkill::executeImp (const Ptr& actor)
     {
+        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
+
         if (MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor) && mUsageType!=-1)
             MWWorld::Class::get (getTarget()).skillUsageSucceeded (actor, mSkillIndex, mUsageType);
     }