[Flightgear-cvslogs] CVS: data/Input/Joysticks/Saitek Cyborg-Gold-3d-USB.xml, 1.23, 1.24

[Melchior F. <mf...@fl...>]

Update of /var/cvs/FlightGear-0.9/data/Input/Joysticks/Saitek
In directory baron:/tmp/cvs-serv15191

Modified Files:
	Cyborg-Gold-3d-USB.xml 
Log Message:
- use cmdarg().getParent() to access own property root
- use kbd-ctrl combinations for weapon control (at least one js in cvs
  should demonstrate that :-)


Index: Cyborg-Gold-3d-USB.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -r1.23 -r1.24
*** Cyborg-Gold-3d-USB.xml	9 Mar 2006 22:32:04 -0000	1.23
--- Cyborg-Gold-3d-USB.xml	24 Jun 2006 18:18:01 -0000	1.24
***************
*** 39,42 ****
--- 39,52 ----
  
  
+ With the keyboard's Control key pressed, the following keys have a different meaning:
+ 
+ Control +            no modifier
+                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ button 0 (trigger):  trigger selected weapon
+ button 1 (left):     switch to previous weapon system
+ button 3 (right):    switch to next weapobn system
+ 
+ 
+ 
  ___________________________________ Customization ____________________________________
  
***************
*** 103,111 ****
  	<nasal>
  		<script><![CDATA[
! 			data = props.globals.getNode(this).getNode("data");
  			mode = data.getNode("mode");
  			modifier = data.getNode("modifier");
  			f1 = f2 = 0;
  			left_brake = right_brake = 0;
  
  			get_mode = func { modifier.getValue() + mode.getValue() * 4 }
--- 113,126 ----
  	<nasal>
  		<script><![CDATA[
! 			data = cmdarg().getParent().getNode("data");
  			mode = data.getNode("mode");
  			modifier = data.getNode("modifier");
  			f1 = f2 = 0;
  			left_brake = right_brake = 0;
+ 			trigger = 0;
+ 
+ 			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);
  
  			get_mode = func { modifier.getValue() + mode.getValue() * 4 }
***************
*** 176,180 ****
  				m = get_mode();
  				if (m == 0) {
! 					controls.applyBrakes(1);
  				} elsif (m == 1) {
  					controls.applyBrakes(1);
--- 191,199 ----
  				m = get_mode();
  				if (m == 0) {
! 					if (kbdctrl.getBoolValue()) {
! 						controls.trigger(trigger = 1);
! 					} else {
! 						controls.applyBrakes(1);
! 					}
  				} elsif (m == 1) {
  					controls.applyBrakes(1);
***************
*** 192,195 ****
--- 211,219 ----
  					m = get_mode();
  					if (m == 0) {
+ 						if (trigger) {
+ 							controls.trigger(trigger = 0);
+ 						} else {
+ 							controls.applyBrakes(0);
+ 						}
  						controls.applyBrakes(0);
  					} elsif (m == 1) {
***************
*** 219,223 ****
  				m = get_mode();
  				if (m == 0) {
! 					controls.flapsDown(-1);
  				} elsif (m == 1) {
  					controls.gearDown(-1);
--- 243,251 ----
  				m = get_mode();
  				if (m == 0) {
! 					if (kbdctrl.getBoolValue()) {
! 						controls.weaponSelect(-1);
! 					} else {
! 						controls.flapsDown(-1);
! 					}
  				} elsif (m == 1) {
  					controls.gearDown(-1);
***************
*** 281,285 ****
  				m = get_mode();
  				if (m == 0) {
! 					controls.flapsDown(1);
  				} elsif (m == 1) {
  					controls.gearDown(1);
--- 309,317 ----
  				m = get_mode();
  				if (m == 0) {
! 					if (kbdctrl.getBoolValue()) {
! 						controls.weaponSelect(1);
! 					} else {
! 						controls.flapsDown(1);
! 					}
  				} elsif (m == 1) {
  					controls.gearDown(1);