From 719663d86eeedd77cce0f576126dd139356e97e7 Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Tue, 8 Jan 2013 19:52:18 -0800
Subject: [PATCH] added option to override the activation distance

The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
---
 apps/openmw/engine.cpp           |  9 ++++++++-
 apps/openmw/engine.hpp           |  4 ++++
 apps/openmw/main.cpp             |  3 +++
 apps/openmw/mwworld/worldimp.cpp | 13 +++++++++++--
 apps/openmw/mwworld/worldimp.hpp |  3 ++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index fcfaed47d..8c288a2ee 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -336,7 +336,8 @@ void OMW::Engine::go()
 
     // Create the world
     mEnvironment.setWorld (new MWWorld::World (*mOgre, mFileCollections, mMaster,
-        mResDir, mCfgMgr.getCachePath(), mNewGame, &encoder, mFallbackMap));
+        mResDir, mCfgMgr.getCachePath(), mNewGame, &encoder, mFallbackMap,
+        mActivationDistanceOverride));
 
     //Load translation data
     mTranslationDataStorage.setEncoder(&encoder);
@@ -509,3 +510,9 @@ void OMW::Engine::setStartupScript (const std::string& path)
 {
     mStartupScript = path;
 }
+
+
+void OMW::Engine::setActivationDistanceOverride (int distance)
+{
+    mActivationDistanceOverride = distance;
+}
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 00889197e..601cc7765 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -76,6 +76,7 @@ namespace OMW
             std::map<std::string,std::string> mFallbackMap;
             bool mScriptConsoleMode;
             std::string mStartupScript;
+            int mActivationDistanceOverride;
 
             Compiler::Extensions mExtensions;
             Compiler::Context *mScriptContext;
@@ -167,6 +168,9 @@ namespace OMW
             /// Set path for a script that is run on startup in the console.
             void setStartupScript (const std::string& path);
 
+            /// Override the game setting specified activation distance.
+            void setActivationDistanceOverride (int distance);
+
         private:
             Files::ConfigurationManager& mCfgMgr;
     };
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 96dbf8987..d1a498610 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -149,6 +149,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
             ->multitoken()->composing(), "fallback values")
 
+        ("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override");
+
         ;
 
     bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
@@ -236,6 +238,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setFallbackValues(variables["fallback"].as<FallbackMap>().mMap);
     engine.setScriptConsoleMode (variables["script-console"].as<bool>());
     engine.setStartupScript (variables["script-run"].as<std::string>());
+    engine.setActivationDistanceOverride (variables["activate-dist"].as<int>());
 
     return true;
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 739d0daab..766fdafa8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -170,10 +170,10 @@ namespace MWWorld
     World::World (OEngine::Render::OgreRenderer& renderer,
         const Files::Collections& fileCollections,
         const std::string& master, const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
-        ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap)
+        ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride)
     : mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0),
       mSky (true), mCells (mStore, mEsm),
-      mNumFacing(0)
+      mNumFacing(0), mActivationDistanceOverride (mActivationDistanceOverride)
     {
         mPhysics = new PhysicsSystem(renderer);
         mPhysEngine = mPhysics->getEngine();
@@ -575,16 +575,25 @@ namespace MWWorld
 
     float World::getMaxActivationDistance ()
     {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
         return (std::max) (getNpcActivationDistance (), getObjectActivationDistance ());
     }
 
     float World::getNpcActivationDistance ()
     {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
         return getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt()*5/4;
     }
 
     float World::getObjectActivationDistance ()
     {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
         return getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt();
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a1ba6fcde..6f8bacf72 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -71,6 +71,7 @@ namespace MWWorld
 
             Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore);
 
+            int mActivationDistanceOverride;
             std::string mFacedHandle;
             float mFacedDistance;
             Ptr mFaced1;
@@ -109,7 +110,7 @@ namespace MWWorld
             World (OEngine::Render::OgreRenderer& renderer,
                 const Files::Collections& fileCollections,
                 const std::string& master, const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
-                ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap);
+                ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride);
 
             virtual ~World();