Added a property output feature to ControlMap that allows arbitrary binding

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index f35c4ab295ee426735a692113fb4d4f56083335f..06122defdc0dd2380a1306ddd1e379d2740c3bca 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -55,15 +55,8 @@
 #include <Cockpit/panel_io.hxx>
 #include <GUI/gui.h>
 
-#ifndef FG_OLD_WEATHER
-#  include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-#  include <Weather/weather.hxx>
-#endif
-
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/options.hxx>
 
 #include "input.hxx"
 
@@ -103,8 +96,8 @@ FGBinding::FGBinding (const SGPropertyNode * node)
 
 FGBinding::~FGBinding ()
 {
-  delete _arg;                 // Delete the saved arguments
-  delete _command_state;       // Delete the saved command state
+//   delete _arg;                      // Delete the saved arguments
+//   delete _command_state;    // Delete the saved command state
 }
 
 void
@@ -204,7 +197,7 @@ FGInput::unbind ()
 }
 
 void 
-FGInput::update ()
+FGInput::update (int dt)
 {
   _update_keyboard();
   _update_joystick();
@@ -667,9 +660,9 @@ FGInput::axis::axis ()
 
 FGInput::axis::~axis ()
 {
-  for (int i = 0; i < FG_MOD_MAX; i++)
-    for (unsigned int j = 0; i < bindings[i].size(); j++)
-      delete bindings[i][j];
+//   for (int i = 0; i < FG_MOD_MAX; i++)
+//     for (int j = 0; i < bindings[i].size(); j++)
+//       delete bindings[i][j];
 }
 
 
@@ -684,9 +677,9 @@ FGInput::joystick::joystick ()
 
 FGInput::joystick::~joystick ()
 {
-  delete js;
-  delete[] axes;
-  delete[] buttons;
+//   delete js;
+//   delete[] axes;
+//   delete[] buttons;
 }