From 693b963bfbd4438fa01b2fd4ed3cd15b62de3f3f Mon Sep 17 00:00:00 2001
From: jimw <jimw>
Date: Sun, 21 Apr 2002 15:06:22 +0000
Subject: [PATCH] Added flag "allow-toggle-cockpit" so that 3d/2d toggle is not
 attempted for aircraft that do not have 3d cockpit configured.  Toggling is
 done with the "c" key.  Note also that for now, since the 3d models don't
 have a "small" panel defined, the "s" key is disabled if
 "allow-toggle-cockpit" is true.

---
 Aircraft/c172-3d-set.xml    |  2 ++
 Aircraft/c310u3a-3d-set.xml |  3 +++
 keyboard.xml                | 39 ++++++++++++++++++++++++++++++++-----
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Aircraft/c172-3d-set.xml b/Aircraft/c172-3d-set.xml
index 6c28e3e2d..cd26ebd41 100644
--- a/Aircraft/c172-3d-set.xml
+++ b/Aircraft/c172-3d-set.xml
@@ -15,6 +15,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
  <sim>
 
   <virtual-cockpit archive="y">true</virtual-cockpit>
+  <allow-toggle-cockpit archive="y">true</allow-toggle-cockpit>
 
   <flight-model archive="y">jsb</flight-model>
   <aero archive="y">c172</aero>
@@ -88,3 +89,4 @@ October 23 2001 John Check, fgpanels@rockfish.net
   
 </PropertyList>
 
+
diff --git a/Aircraft/c310u3a-3d-set.xml b/Aircraft/c310u3a-3d-set.xml
index 06d893e5b..27e04b336 100644
--- a/Aircraft/c310u3a-3d-set.xml
+++ b/Aircraft/c310u3a-3d-set.xml
@@ -15,6 +15,8 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
  <sim>
   
   <virtual-cockpit archive="y">true</virtual-cockpit>
+  <allow-toggle-cockpit archive="y">true</allow-toggle-cockpit>
+
   <flight-model archive="y">jsb</flight-model>
   <aero archive="y">c310u3a</aero>
 
@@ -116,3 +118,4 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
 
 
 
+
diff --git a/keyboard.xml b/keyboard.xml
index 13bcea00d..7d88fd7c7 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -635,29 +635,47 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <name>c</name>
   <desc>Toggle 3D/2D cockpit</desc>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <command>property-swap</command>
    <property>/sim/panel[0]/path</property>
    <property>/sim/panel[1]/path</property>
   </binding>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <command>property-assign</command>
    <property>/sim/current-view/heading-offset-deg</property>
    <value type="double">0</value>
   </binding>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <command>property-assign</command>
    <property>/sim/current-view/pitch-offset-deg</property>
    <value type="double">0</value>
   </binding>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <desc>Load panel.</desc>
    <command>panel-load</command>
   </binding>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <command>property-toggle</command>
    <property>/sim/view/internal</property>
   </binding>
   <binding>
+   <condition>
+     <property>/sim/allow-toggle-cockpit</property>
+   </condition>
    <command>property-toggle</command>
    <property>/sim/virtual-cockpit</property>
   </binding>
@@ -699,13 +717,23 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <name>s</name>
   <desc>Swap panels.</desc>
   <binding>
-  <command>property-swap</command>
-  <property>/sim/panel/path</property>
-  <property>/sim/panel_2/path</property>
+   <condition>
+     <not>
+     <property>/sim/allow-toggle-cockpit</property>
+     </not>
+   </condition>
+   <command>property-swap</command>
+   <property>/sim/panel/path</property>
+   <property>/sim/panel_2/path</property>
   </binding>
   <binding>
-  <desc>Load panel.</desc>
-  <command>panel-load</command>
+   <condition>
+     <not>
+     <property>/sim/allow-toggle-cockpit</property>
+     </not>
+   </condition>
+   <desc>Load panel.</desc>
+   <command>panel-load</command>
   </binding>
  </key>
 
@@ -1150,3 +1178,4 @@ calculated by adding 256 to the GLUT key value in glut.h.
 
 
 
+