From 793649c854d759a40fcb8b0421295a6f23c3ac2f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 26 Mar 2014 19:55:52 +0100
Subject: [PATCH] ToggleAI: Report current status on toggle

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 3 ++-
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 apps/openmw/mwscript/aiextensions.cpp           | 7 ++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 22dda0ce0..e4c480a8c 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -156,7 +156,7 @@ namespace MWBase
             /// paused we may want to do it manually (after equipping permanent enchantment)
             virtual void updateMagicEffects (const MWWorld::Ptr& ptr) = 0;
 
-            virtual void toggleAI() = 0;
+            virtual bool toggleAI() = 0;
             virtual bool isAIActive() = 0;
 
             virtual void getObjectsInRange (const Ogre::Vector3& position, float radius, std::vector<MWWorld::Ptr>& objects) = 0;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 4c8f35edb..3164ca155 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -750,9 +750,10 @@ namespace MWMechanics
         mActors.updateMagicEffects(ptr);
     }
 
-    void MechanicsManager::toggleAI()
+    bool MechanicsManager::toggleAI()
     {
         mAI = !mAI;
+        return mAI;
     }
 
     bool MechanicsManager::isAIActive()
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 761caf586..5dd758377 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -137,7 +137,7 @@ namespace MWMechanics
 
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
-            virtual void toggleAI();
+            virtual bool toggleAI();
             virtual bool isAIActive();
 
             virtual void playerLoaded();
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 8314d011a..a34c5476c 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -464,7 +464,12 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
-                    MWBase::Environment::get().getMechanicsManager()->toggleAI();   
+                    InterpreterContext& context
+                        = static_cast<InterpreterContext&> (runtime.getContext());
+
+                    bool enabled = MWBase::Environment::get().getMechanicsManager()->toggleAI();
+
+                    context.report (enabled ? "AI -> On" : "AI -> Off");
                 }
         };