FGPUIDialog: fix reading from already free'd memory.

[flightgear.git] / src / FDM / YASim / ControlMap.cpp

diff --git a/src/FDM/YASim/ControlMap.cpp b/src/FDM/YASim/ControlMap.cpp
index 1b9de6834a3068f0177d7fbc15247d9f238bef5c..c300c4c754b90b58476f5b7a813472b503cdeb0b 100644 (file)
--- a/src/FDM/YASim/ControlMap.cpp
+++ b/src/FDM/YASim/ControlMap.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Jet.hpp"
 #include "Thruster.hpp"
 #include "PropEngine.hpp"
@@ -190,7 +194,8 @@ void ControlMap::applyControls(float dt)
        switch(o->type) {
        case THROTTLE: ((Thruster*)obj)->setThrottle(lval);        break;
        case MIXTURE:  ((Thruster*)obj)->setMixture(lval);         break;
-        case CONDLEVER: ((TurbineEngine*)((PropEngine*)obj)->getEngine())->setCondLever(lval); break;
+    case CONDLEVER: ((TurbineEngine*)((PropEngine*)
+                        obj)->getEngine())->setCondLever(lval); break;
        case STARTER:  ((Thruster*)obj)->setStarter(lval != 0.0);  break;
        case MAGNETOS: ((PropEngine*)obj)->setMagnetos((int)lval); break;
        case ADVANCE:  ((PropEngine*)obj)->setAdvance(lval);       break;
@@ -203,16 +208,29 @@ void ControlMap::applyControls(float dt)
        case EXTEND:   ((Gear*)obj)->setExtension(lval);           break;
        case HEXTEND:  ((Hook*)obj)->setExtension(lval);           break;
        case LEXTEND:  ((Launchbar*)obj)->setExtension(lval);      break;
+    case LACCEL:   ((Launchbar*)obj)->setAcceleration(lval);   break;
        case CASTERING:((Gear*)obj)->setCastering(lval != 0);      break;
        case SLAT:     ((Wing*)obj)->setSlat(lval);                break;
        case FLAP0:    ((Wing*)obj)->setFlap0(lval, rval);         break;
+       case FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break;
        case FLAP1:    ((Wing*)obj)->setFlap1(lval, rval);         break;
+       case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break;
        case SPOILER:  ((Wing*)obj)->setSpoiler(lval, rval);       break;
         case COLLECTIVE:   ((Rotor*)obj)->setCollective(lval);     break;
         case CYCLICAIL:    ((Rotor*)obj)->setCyclicail(lval,rval); break;
         case CYCLICELE:    ((Rotor*)obj)->setCyclicele(lval,rval); break;
-        case ROTORBRAKE:    ((Rotorgear*)obj)->setRotorBrake(lval); break;
-        case ROTORENGINEON: ((Rotorgear*)obj)->setEngineOn((int)lval); break;
+        case TILTPITCH:    ((Rotor*)obj)->setTiltPitch(lval);      break;
+        case TILTYAW:      ((Rotor*)obj)->setTiltYaw(lval);        break;
+        case TILTROLL:     ((Rotor*)obj)->setTiltRoll(lval);       break;
+        case ROTORBALANCE:
+                           ((Rotor*)obj)->setRotorBalance(lval);   break;
+        case ROTORBRAKE:   ((Rotorgear*)obj)->setRotorBrake(lval); break;
+        case ROTORENGINEON: 
+                        ((Rotorgear*)obj)->setEngineOn((int)lval); break;
+        case ROTORENGINEMAXRELTORQUE: 
+              ((Rotorgear*)obj)->setRotorEngineMaxRelTorque(lval); break;
+        case ROTORRELTARGET:
+                       ((Rotorgear*)obj)->setRotorRelTarget(lval); break;
        case REVERSE_THRUST: ((Jet*)obj)->setReverse(lval != 0);   break;
        case BOOST:
            ((PistonEngine*)((Thruster*)obj)->getEngine())->setBoost(lval);
@@ -240,6 +258,8 @@ float ControlMap::rangeMin(int type)
     case COLLECTIVE: return -1;
     case WINCHRELSPEED: return -1;
     case MAGNETOS: return 0;   // [0:3]
+    case FLAP0EFFECTIVENESS: return 1;  // [0:10]
+    case FLAP1EFFECTIVENESS: return 1;  // [0:10]
     default:       return 0;   // [0:1]
     }
 }
@@ -252,6 +272,8 @@ float ControlMap::rangeMax(int type)
     case FLAP1:    return 1;
     case STEER:    return 1;
     case MAGNETOS: return 3; // [0:3]
+    case FLAP0EFFECTIVENESS: return 10;//  [0:10]
+    case FLAP1EFFECTIVENESS: return 10;//  [0:10]
     default:       return 1; // [0:1]
     }
 }