Merge pull request #1515 from akortunov/guifixes

Fix a 'Good Beast' companion window

apps/openmw/mwgui/dialogue.cpp

@@ -391,8 +391,8 @@ namespace MWGui
             // No greetings found. The dialogue window should not be shown.
             // If this is a companion, we must show the companion window directly (used by BM_bear_be_unique).
             MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
-            if (isCompanion())
+            if (isCompanion(actor))
-                MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, mPtr);
+                MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, actor);
             return;
         }
 
@@ -698,8 +698,13 @@ namespace MWGui
 
     bool DialogueWindow::isCompanion()
     {
-        return !mPtr.getClass().getScript(mPtr).empty()
+        return isCompanion(mPtr);
-                && mPtr.getRefData().getLocals().getIntVar(mPtr.getClass().getScript(mPtr), "companion");
+    }
+
+    bool DialogueWindow::isCompanion(const MWWorld::Ptr& actor)
+    {
+        return !actor.getClass().getScript(actor).empty()
+                && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
     }
 
     void DialogueWindow::onPersuadeResult(const std::string &title, const std::string &text)

apps/openmw/mwgui/dialogue.hpp

@@ -133,6 +133,7 @@ namespace MWGui
     protected:
         void updateTopics();
         void updateTopicsPane();
+        bool isCompanion(const MWWorld::Ptr& actor);
         bool isCompanion();
 
         void onPersuadeResult(const std::string& title, const std::string& text);