Boris Koenig:

[flightgear.git] / src / Controls / controls.hxx

diff --git a/src/Controls/controls.hxx b/src/Controls/controls.hxx
index ad7e3085c463fc3a014a2ed95ca2ff92c69f43af..82f9b92336cbfbed7c80fa3097e8012c2e27348e 100644 (file)
--- a/src/Controls/controls.hxx
+++ b/src/Controls/controls.hxx
@@ -140,7 +140,7 @@ private:
     bool augmentation[MAX_ENGINES];
     bool reverser[MAX_ENGINES];
     bool water_injection[MAX_ENGINES];
-    int condition[MAX_ENGINES];           // turboprop speed select
+    double condition[MAX_ENGINES];           // turboprop speed select
 
     // controls/fuel/
     bool dump_valve;
@@ -154,7 +154,11 @@ private:
     bool boost_pump[MAX_TANKS * MAX_BOOSTPUMPS];
 
     // controls/gear/
-    double parking_brake;
+    double brake_left;
+    double brake_right;
+    double copilot_brake_left;
+    double copilot_brake_right;
+    double brake_parking;
     double steering;
     bool gear_down;
     bool antiskid;
@@ -162,7 +166,6 @@ private:
     bool tailwheel_lock;
 
     // controls/gear/wheel[n]/
-    double brake[MAX_WHEELS];
     bool alternate_extension[MAX_WHEELS];
 
     // controls/anti-ice/
@@ -315,7 +318,7 @@ public:
     inline bool get_water_injection(int engine) const { 
         return water_injection[engine]; 
     }
-    inline int get_condition(int engine) const { return condition[engine]; }
+    inline double get_condition(int engine) const { return condition[engine]; }
 
     // controls/fuel/
     inline bool get_dump_valve() const { return dump_valve; }
@@ -333,7 +336,11 @@ public:
     }
 
     // controls/gear/
-    inline double get_parking_brake() const { return parking_brake; }
+    inline double get_brake_left() const { return brake_left; }
+    inline double get_brake_right() const { return brake_right; }
+    inline double get_copilot_brake_left() const { return copilot_brake_left; }
+    inline double get_copilot_brake_right() const { return copilot_brake_right; }
+    inline double get_brake_parking() const { return brake_parking; }
     inline double get_steering() const { return steering; }
     inline bool get_gear_down() const { return gear_down; }
     inline bool get_antiskid() const { return antiskid; }
@@ -341,7 +348,6 @@ public:
     inline bool get_tailwheel_lock() const { return tailwheel_lock; }
 
     // controls/gear/wheel[n]/
-    inline double get_brake(int wheel) const { return brake[wheel]; }
     inline bool get_alternate_extension(int wheel) const {
         return alternate_extension[wheel];
     }
@@ -499,7 +505,7 @@ public:
     void set_augmentation( int engine, bool val );
     void set_reverser( int engine, bool val );
     void set_water_injection( int engine, bool val );
-    void set_condition( int engine, int val );    
+    void set_condition( int engine, double val );    
 
     // controls/fuel
     void set_dump_valve( bool val );
@@ -513,7 +519,13 @@ public:
     void set_boost_pump( int index, bool val );
 
     // controls/gear/
-    void set_parking_brake( double pos );
+    void set_brake_left( double pos );
+    void move_brake_left( double amt );
+    void set_brake_right( double pos );
+    void move_brake_right( double amt );
+    void set_copilot_brake_left( double pos );
+    void set_copilot_brake_right( double pos );
+    void set_brake_parking( double pos );
     void set_steering( double pos );
     void move_steering( double amt );
     void set_gear_down( bool gear );
@@ -522,8 +534,6 @@ public:
     void set_tailwheel_lock( bool val );
 
     // controls/gear/wheel[n]/
-    void set_brake( int wheel, double pos );
-    void move_brake( int wheel, double amt );
     void set_alternate_extension( int wheel, bool val );
 
     // controls/anti-ice/