From e3d38a6228025b8ed173dcee6bac63c6cf3ce3e1 Mon Sep 17 00:00:00 2001
From: Anders Gidenstam <anders@gidenstam.org>
Date: Sat, 21 Feb 2015 20:56:16 +0100
Subject: [PATCH] Issue 1649: Fix for Transponder TDR-94.

The transponder instrument MUST be named "transponder" in the instrumentation
file to work with multiplayer and the radio dialog.

Thanks to lens(at)bitwisetech.com for the report and patch.
---
 .../TDR-94/ctl92-transponder.xml              | 46 +++++++++----------
 Aircraft/Instruments-3d/TDR-94/ctl92.ac       |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml b/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
index 376dc10ce..fbab49a5e 100644
--- a/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
+++ b/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
@@ -22,7 +22,7 @@ Syd Adams
                     <value>1</value>
                 </greater-than>
                 <greater-than>
-                    <property>instrumentation/kt-70/inputs/knob-mode</property>
+                    <property>instrumentation/transponder/inputs/knob-mode</property>
                     <value>0</value>
                 </greater-than>
             </and>
@@ -45,7 +45,7 @@ Syd Adams
         <action>
             <binding>
                 <command>property-cycle</command>
-                <property>instrumentation/kt-70/inputs/knob-mode</property>
+                <property>instrumentation/transponder/inputs/knob-mode</property>
                 <wrap>0</wrap> <!-- don't wrap at the ends -->
                 
                 <value>0</value>
@@ -57,7 +57,7 @@ Syd Adams
         </action>
         
 
-        <property>instrumentation/kt-70/inputs/knob-mode</property>
+        <property>instrumentation/transponder/inputs/knob-mode</property>
         <interpolation>
             <entry><ind>0</ind><dep>0.0</dep></entry><!--OFF-->
             <entry><ind>1</ind><dep>30.0</dep></entry><!--STBY-->
@@ -84,7 +84,7 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.001</object-name>
-        <property>instrumentation/kt-70/inputs/digit[3]</property>
+        <property>instrumentation/transponder/inputs/digit[3]</property>
         <factor>0.1</factor>
         <step>1</step>
         <axis>
@@ -97,7 +97,7 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.002</object-name>
-        <property>instrumentation/kt-70/inputs/digit[2]</property>
+        <property>instrumentation/transponder/inputs/digit[2]</property>
         <factor>0.1</factor>
         <step>1</step>
         <axis>
@@ -110,7 +110,7 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.003</object-name>
-        <property>instrumentation/kt-70/inputs/digit[1]</property>
+        <property>instrumentation/transponder/inputs/digit[1]</property>
         <factor>0.1</factor>
         <step>1</step>
         <axis>
@@ -123,7 +123,7 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.004</object-name>
-        <property>instrumentation/kt-70/inputs/digit[0]</property>
+        <property>instrumentation/transponder/inputs/digit[0]</property>
         <factor>0.1</factor>
         <step>1</step>
         <axis>
@@ -143,20 +143,20 @@ Syd Adams
             <repeatable>false</repeatable>
             <binding>
             <command>property-toggle</command>
-            <property>instrumentation/kt-70/inputs/ident-btn</property>
+            <property>instrumentation/transponder/inputs/ident-btn</property>
         </binding>
         </action>
     </animation>
 
     <animation>
         <type>pick</type>
-        <object-name>act.pre</object-name>
+        <object-name>atc.pre</object-name>
         <action>
             <button>0</button>
             <repeatable>false</repeatable>
             <binding>
             <command>property-assign</command>
-            <property>instrumentation/kt-70/id-code</property>
+            <property>instrumentation/transponder/id-code</property>
             <value>1200</value>
         </binding>
         </action>
@@ -164,7 +164,7 @@ Syd Adams
     
     <animation>
         <type>pick</type>
-        <object-name>act.toggle</object-name>
+        <object-name>CTL-92.toggle</object-name>
         <action>
             <repeatable>false</repeatable>
             <binding>
@@ -183,11 +183,11 @@ Syd Adams
             <binding>
                 <command>property-assign</command>
                 <property>instrumentation/tdr-94/saved-mode</property>
-                <property>instrumentation/kt-70/inputs/knob-mode</property>
+                <property>instrumentation/transponder/inputs/knob-mode</property>
             </binding>
             <binding>
                 <command>property-assign</command>
-                <property>instrumentation/kt-70/inputs/knob-mode</property>
+                <property>instrumentation/transponder/inputs/knob-mode</property>
                 <value>2</value> <!-- test mode -->
             </binding>
             
@@ -195,7 +195,7 @@ Syd Adams
                 <!-- restore previous mode on button release -->
                 <binding>
                     <command>property-assign</command>
-                    <property>instrumentation/kt-70/inputs/knob-mode</property>
+                    <property>instrumentation/transponder/inputs/knob-mode</property>
                     <property>instrumentation/tdr-94/saved-mode</property>
                 </binding>
             </mod-up>
@@ -209,8 +209,8 @@ Syd Adams
            <binding>
                <command>nasal</command>
                <script><![CDATA[
-                   var loDigit = getprop('instrumentation/kt-70/inputs/digit[2]');
-                   var hiDigit = getprop('instrumentation/kt-70/inputs/digit[3]');
+                   var loDigit = getprop('instrumentation/transponder/inputs/digit[2]') or 2;
+                   var hiDigit = getprop('instrumentation/transponder/inputs/digit[3]') or 1;
                    
                    var offset = int(cmdarg().getNode('offset').getValue());
                    var incr = (offset > 0);
@@ -220,8 +220,8 @@ Syd Adams
                    }
                    
                    loDigit = math.mod(loDigit + offset, 8);
-                   setprop('instrumentation/kt-70/inputs/digit[2]', loDigit);
-                   setprop('instrumentation/kt-70/inputs/digit[3]', hiDigit);
+                   setprop('instrumentation/transponder/inputs/digit[2]', loDigit);
+                   setprop('instrumentation/transponder/inputs/digit[3]', hiDigit);
                ]]></script>
             </binding>
         </action>
@@ -234,8 +234,8 @@ Syd Adams
             <binding>
                 <command>nasal</command>
                 <script><![CDATA[
-                    var loDigit = getprop('instrumentation/kt-70/inputs/digit[0]');
-                    var hiDigit = getprop('instrumentation/kt-70/inputs/digit[1]');
+                    var loDigit = getprop('instrumentation/transponder/inputs/digit[0]') or 0;
+                    var hiDigit = getprop('instrumentation/transponder/inputs/digit[1]') or 0;
                    
                     var offset = int(cmdarg().getNode('offset').getValue());
                     var incr = (offset > 0);
@@ -245,12 +245,12 @@ Syd Adams
                     }
                    
                     loDigit = math.mod(loDigit + offset, 8);
-                    setprop('instrumentation/kt-70/inputs/digit[0]', loDigit);
-                    setprop('instrumentation/kt-70/inputs/digit[1]', hiDigit);
+                    setprop('instrumentation/transponder/inputs/digit[0]', loDigit);
+                    setprop('instrumentation/transponder/inputs/digit[1]', hiDigit);
                 ]]></script>
             </binding>
         </action>
     </animation>
 
 
-</PropertyList>
\ No newline at end of file
+</PropertyList>
diff --git a/Aircraft/Instruments-3d/TDR-94/ctl92.ac b/Aircraft/Instruments-3d/TDR-94/ctl92.ac
index 1f0a06073..0acf90048 100644
--- a/Aircraft/Instruments-3d/TDR-94/ctl92.ac
+++ b/Aircraft/Instruments-3d/TDR-94/ctl92.ac
@@ -1459,7 +1459,7 @@ refs 3
 31 0.657934963703 0.408358514309
 kids 0
 OBJECT poly
-name "act.pre"
+name "atc.pre"
 data 10
 Circle.004
 texture "ctl-92.png"