From 8b18d195bdeab4e3a6f6bd7329d7fc7d8f9437d5 Mon Sep 17 00:00:00 2001 From: Greendogo Date: Tue, 27 Nov 2012 04:50:49 -0600 Subject: [PATCH 1/3] Update apps/openmw/main.cpp Edited the description for the --script-run switch. --- apps/openmw/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index 2da52311f..0563fdbbb 100644 --- a/apps/openmw/main.cpp +++ b/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()->default_value(""), - "select a file that is executed in the console on startup\n\n" - "Note: The file contains a list of script lines, but not a complete scripts. " - "That means no begin/end and no variable declarations.") + "select a file containing a list of console commands that is executed on startup") ("new-game", bpo::value()->implicit_value(true) ->default_value(false), "activate char gen/new game mechanics") From 43d8c6c4841b6115340e6b5706051bb8e7fd3ebf Mon Sep 17 00:00:00 2001 From: Greendogo Date: Tue, 27 Nov 2012 05:15:03 -0600 Subject: [PATCH 2/3] Update readme.txt --- readme.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/readme.txt b/readme.txt index 9a9010994..196105393 100644 --- a/readme.txt +++ b/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 - e on startup + --script-run arg 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 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 ) From 5eb0f489e20e0102fa57b77fbabadd7fe5828d69 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 27 Nov 2012 18:39:12 +0100 Subject: [PATCH 3/3] Issue 476: fixed auto-move bypassing disabled player controls --- apps/openmw/mwinput/inputmanagerimp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index af30c9b04..6a1c3aa9b 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/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()