Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting

apps/openmw/main.cpp

@@ -131,9 +131,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
             ->default_value(false), "enable console-only script functionality")
 
         ("script-run", bpo::value<std::string>()->default_value(""),
-            "select a file that is executed in the console on startup\n\n"
+            "select a file containing a list of console commands that is executed on startup")
-            "Note: The file contains a list of script lines, but not a complete scripts. "
-            "That means no begin/end and no variable declarations.")
 
         ("new-game", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "activate char gen/new game mechanics")

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -624,7 +624,9 @@ namespace MWInput
     void InputManager::toggleAutoMove()
     {
         if (mWindows.isGuiMode()) return;
-        mPlayer.setAutoMove (!mPlayer.getAutoMove());
+
+        if (mControlSwitch["playercontrols"])
+            mPlayer.setAutoMove (!mPlayer.getAutoMove());
     }
 
     void InputManager::toggleWalking()

readme.txt

@@ -69,12 +69,9 @@ Allowed options:
   --script-all [=arg(=1)] (=0)     compile all scripts (excluding dialogue scri
                                    pts) at startup
   --script-console [=arg(=1)] (=0) enable console-only script functionality
-  --script-run arg                 select a file that is executed in the consol
+  --script-run arg                 select a file containing a list of console
-                                   e on startup
+                                   commands that is executed on startup
 
-                                   Note: The file contains a list of script
-                                   lines, but not a complete scripts. That mean
-                                   s no begin/end and no variable declarations.
   --new-game [=arg(=1)] (=0)       activate char gen/new game mechanics
   --fs-strict [=arg(=1)] (=0)      strict file system handling (no case folding
                                    )