From a6d30bc2e3014c77b883de9ceab40d141078f78f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 18 Dec 2014 10:20:15 +0100
Subject: [PATCH] consider --script-warn when running with
 --script-all-dialogue

---
 apps/openmw/engine.cpp                | 2 +-
 apps/openmw/mwdialogue/scripttest.cpp | 9 +++++----
 apps/openmw/mwdialogue/scripttest.hpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 885d2bb4f..6ea09d4c9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -436,7 +436,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
     if (mCompileAllDialogue)
     {
-        std::pair<int, int> result = MWDialogue::ScriptTest::compileAll(&mExtensions);
+        std::pair<int, int> result = MWDialogue::ScriptTest::compileAll(&mExtensions, mWarningsMode);
         if (result.first)
             std::cout
                 << "compiled " << result.second << " of " << result.first << " dialogue script/actor combinations a("
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index a8de21ef9..b2c8f536a 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -21,7 +21,7 @@
 namespace
 {
 
-void test(const MWWorld::Ptr& actor, int &compiled, int &total, const Compiler::Extensions* extensions)
+void test(const MWWorld::Ptr& actor, int &compiled, int &total, const Compiler::Extensions* extensions, int warningsMode)
 {
     MWDialogue::Filter filter(actor, 0, false);
 
@@ -29,6 +29,7 @@ void test(const MWWorld::Ptr& actor, int &compiled, int &total, const Compiler::
     compilerContext.setExtensions(extensions);
     std::ostream errorStream(std::cout.rdbuf());
     Compiler::StreamErrorHandler errorHandler(errorStream);
+    errorHandler.setWarningsMode (warningsMode);
 
     const MWWorld::Store<ESM::Dialogue>& dialogues = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
     for (MWWorld::Store<ESM::Dialogue>::iterator it = dialogues.begin(); it != dialogues.end(); ++it)
@@ -100,21 +101,21 @@ namespace MWDialogue
 namespace ScriptTest
 {
 
-    std::pair<int, int> compileAll(const Compiler::Extensions *extensions)
+    std::pair<int, int> compileAll(const Compiler::Extensions *extensions, int warningsMode)
     {
         int compiled = 0, total = 0;
         const MWWorld::Store<ESM::NPC>& npcs = MWBase::Environment::get().getWorld()->getStore().get<ESM::NPC>();
         for (MWWorld::Store<ESM::NPC>::iterator it = npcs.begin(); it != npcs.end(); ++it)
         {
             MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
-            test(ref.getPtr(), compiled, total, extensions);
+            test(ref.getPtr(), compiled, total, extensions, warningsMode);
         }
 
         const MWWorld::Store<ESM::Creature>& creatures = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
         for (MWWorld::Store<ESM::Creature>::iterator it = creatures.begin(); it != creatures.end(); ++it)
         {
             MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
-            test(ref.getPtr(), compiled, total, extensions);
+            test(ref.getPtr(), compiled, total, extensions, warningsMode);
         }
         return std::make_pair(total, compiled);
     }
diff --git a/apps/openmw/mwdialogue/scripttest.hpp b/apps/openmw/mwdialogue/scripttest.hpp
index 1ed94c76a..0ac259725 100644
--- a/apps/openmw/mwdialogue/scripttest.hpp
+++ b/apps/openmw/mwdialogue/scripttest.hpp
@@ -11,7 +11,7 @@ namespace ScriptTest
 
 /// Attempt to compile all dialogue scripts, use for verification purposes
 /// @return A pair containing <total number of scripts, number of successfully compiled scripts>
-std::pair<int, int> compileAll(const Compiler::Extensions* extensions);
+std::pair<int, int> compileAll(const Compiler::Extensions* extensions, int warningsMode);
 
 }