From eab53706baf3501f43135432057d2ddf52b9c6f5 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Mon, 11 Jun 2007 19:23:15 +0000
Subject: [PATCH] - replace "view-cycle" fgcommand by view.stepView() wrapper  
 (This fgcommand was broken for a few weeks. Now it's fixed, but the   wrapper
 use is desirable, as this allows easy redefining.) - cyborg gold: cosmetics

---
 .../Boeder/p20_flightstick_pro_usb.xml        |  4 +--
 Input/Joysticks/CH/pro-yoke-usb.xml           |  3 +-
 .../Logitech/wingman-rumblepad-usb.xml        |  3 +-
 .../Logitech/wingman-strike-force-3d.xml      |  4 +--
 .../MegaWorld/USB-Game-Controllers.xml        |  3 +-
 .../Microsoft/sidewinder-precision-pro.xml    |  5 ++--
 .../Saitek/Cyborg-3d-Rumble-Force.xml         |  4 +--
 Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml | 28 ++++++++++---------
 8 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Input/Joysticks/Boeder/p20_flightstick_pro_usb.xml b/Input/Joysticks/Boeder/p20_flightstick_pro_usb.xml
index 91dcb2eaa..4e8478609 100644
--- a/Input/Joysticks/Boeder/p20_flightstick_pro_usb.xml
+++ b/Input/Joysticks/Boeder/p20_flightstick_pro_usb.xml
@@ -143,8 +143,8 @@ $Id$
   <desc>View Cycle</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>view-cycle</command>
-   <step type="double">1</step>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index 3fb5f8705..8fe20c6d6 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -142,7 +142,8 @@
   <desc>Cycle View</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>view-cycle</command>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
index ac485d9ae..4e6c5c522 100644
--- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -208,7 +208,8 @@ $Id$
   <desc>Cycle View</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>view-cycle</command>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/Logitech/wingman-strike-force-3d.xml b/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
index 8d0390690..56c54b659 100644
--- a/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
@@ -93,8 +93,8 @@ $Id$
 		<desc>View Cycle</desc>
 		<repeatable>false</repeatable>
 		<binding>
-			<command>view-cycle</command>
-			<step type="double">1</step>
+			<command>nasal</command>
+			<script>view.stepView(1)</script>
 		</binding>
 	</button>
 
diff --git a/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml b/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml
index 5c2a81841..fa7a0bca8 100644
--- a/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml
+++ b/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml
@@ -93,7 +93,8 @@
   <button n="1">
     <repeatable>false</repeatable>
     <binding>
-      <command>view-cycle</command>
+      <command>nasal</command>
+      <script>view.stepView(1)</script>
     </binding>
   </button>
   <button n="2">
diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
index e8923108d..964c7d776 100644
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
@@ -166,10 +166,11 @@ $Id$
 
 
  <button n="1">
-  <desc>view-cycle</desc>
+  <desc>Cycle view</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>view-cycle</command>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
index 8025dca55..c68a9d98d 100644
--- a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
+++ b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
@@ -131,8 +131,8 @@ $Id$
   <desc>External Views</desc>
   <repeatable type="bool">false</repeatable>
   <binding>
-   <command>view-cycle</command>
-   <step type="double">1</step>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index 801f30def..0e36432ca 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -112,26 +112,28 @@ ________________________________________________________________________________
 
 	<nasal>
 		<script><![CDATA[
-			self = cmdarg().getParent();
-			data = self.getNode("data");
-			mode = data.getNode("mode");
-			modifier = data.getNode("modifier");
-			f1 = f2 = 0;
-			left_brake = right_brake = 0;
-			trigger = 0;
+			var self = cmdarg().getParent();
+			var data = self.getNode("data");
+			var mode = data.getNode("mode");
+			var modifier = data.getNode("modifier");
+			var f1 = 0;
+			var f2 = 0;
+			var left_brake = 0;
+			var right_brake = 0;
+			var trigger = 0;
 
 			if (props.globals.getNode("/rotors", 0) != nil) {
 				self.getNode("axis[0]/binding/power").setIntValue(1);
 				self.getNode("axis[1]/binding/power").setIntValue(1);
 			}
 
-			kbdshift = props.globals.getNode("/devices/status/keyboard/shift", 1);
-			kbdctrl = props.globals.getNode("/devices/status/keyboard/ctrl", 1);
-			kbdalt = props.globals.getNode("/devices/status/keyboard/alt", 1);
+			var kbdshift = props.globals.getNode("/devices/status/keyboard/shift", 1);
+			var kbdctrl = props.globals.getNode("/devices/status/keyboard/ctrl", 1);
+			var kbdalt = props.globals.getNode("/devices/status/keyboard/alt", 1);
 
-			get_mode = func { modifier.getValue() + mode.getValue() * 4 }
+			var get_mode = func { modifier.getValue() + mode.getValue() * 4 }
 
-			harrier = func {
+			var harrier = func {
 				if (getprop("/sim/aero") == "harrier") {
 					thv = getprop("/controls/engines/engine[0]/mixture");
 					gui.popupTip("Thrust vector " ~ int(thv * 120 - 20 + 0.5));
@@ -296,7 +298,7 @@ ________________________________________________________________________________
 				} elsif (m == 1) {
 					i = !getprop("/controls/gear/tailwheel-lock");
 					setprop("/controls/gear/tailwheel-lock", i);
-					gui.popupTip("Tail Wheel " ~ ["UNLOCKED", "LOCKED"][i]);
+					gui.popupTip("Tail Wheel " ~ (i ? "LOCKED" : "UNLOCKED"));
 				} elsif (m == 2) {
 					setprop("/sim/current-view/view-number", 0);
 					view.resetView();