From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Thu, 19 Jun 2014 12:28:14 +0000 (+0200)
Subject: Remove unused --control option
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c99d5d9d6c2c741d61fb1b61d0ef23a5220c087;p=flightgear.git

Remove unused --control option
---

diff --git a/man/fgfs.1.in b/man/fgfs.1.in
index cdb65eb78..d2086bdba 100644
--- a/man/fgfs.1.in
+++ b/man/fgfs.1.in
@@ -78,9 +78,6 @@ Set the initial COM2 radio frequency.
 Load additional properties from path.  Multiple instances of this
 option are recognized.
 .TP
-.BI "--control=" "mode"
-Primary control mode (joystick, keyboard, mouse).
-.TP
 .BI "--dme=" "{nav1|nav2|frequency}"
 Specify the NAV radio from which to slave the ADF or set its internal
 frequency.
diff --git a/scripts/completion/fg-completion.bash b/scripts/completion/fg-completion.bash
index 4f34e2dd1..fe55f1679 100755
--- a/scripts/completion/fg-completion.bash
+++ b/scripts/completion/fg-completion.bash
@@ -98,7 +98,6 @@ __fgfs_options="
 	--fg-root=
 	--fg-scenery=
 	--language=
-	--control=
 	--browser-app=
 	--config=
 	--failure=
@@ -252,9 +251,6 @@ __fgfs() {
 	--carrier=*)
 		alt=$(__fgfs_offer Nimitz Eisenhower Foch)
 		;;
-	--control=*)
-		alt=$(__fgfs_offer joystick keyboard mouse)
-		;;
 	--failure=*)
 		alt=$(__fgfs_offer pitot static vacuum electrical)
 		;;
diff --git a/scripts/completion/fg-completion.zsh b/scripts/completion/fg-completion.zsh
index f4cda35db..3835b23d9 100755
--- a/scripts/completion/fg-completion.zsh
+++ b/scripts/completion/fg-completion.zsh
@@ -87,7 +87,6 @@ _fgfs_options=(
 	'--fg-root=[Specify the root data path]:Directories:_directories' \
 	'--fg-scenery=[Specify the base scenery path]:Directories:_directories' \
 	'--language=[Select the language for this session]:Language:->language' \
-	'--control=[Primary control mode]:Primary control mode:(joystick keyboard mouse)' \
 	'--browser-app=[Specify path to your web browser]:Directories:_directories' \
 	'--config=[Load additional properties from path]' \
 	'--failure=[Fail the pitot, static, vacuum, or electrical system]:Failure system:(pitot static vaccum electical)'
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 991b39c36..0389faa19 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -162,7 +162,6 @@ void fgSetDefaults ()
     // we want mouse-pointer to have an undefined value if nothing is
     // specified so we can do the right thing for voodoo-1/2 cards.
     // fgSetString("/sim/startup/mouse-pointer", "disabled");
-    fgSetString("/sim/control-mode", "joystick");
     fgSetBool("/controls/flight/auto-coordination", false);
     fgSetString("/sim/logging/priority", "alert");
 
@@ -1467,7 +1466,6 @@ struct OptionDesc {
     {"enable-hud-3d",                false, OPTION_BOOL,   "/sim/hud/enable3d[1]", true, "", 0 },
     {"disable-anti-alias-hud",       false, OPTION_BOOL,   "/sim/hud/color/antialiased", false, "", 0 },
     {"enable-anti-alias-hud",        false, OPTION_BOOL,   "/sim/hud/color/antialiased", true, "", 0 },
-    {"control",                      true,  OPTION_STRING, "/sim/control-mode", false, "", 0 },
     {"disable-auto-coordination",    false, OPTION_BOOL,   "/controls/flight/auto-coordination", false, "", 0 },
     {"enable-auto-coordination",     false, OPTION_BOOL,   "/controls/flight/auto-coordination", true, "", 0 },
     {"browser-app",                  true,  OPTION_STRING, "/sim/startup/browser-app", false, "", 0 },