Accept multiple names for the same joystick.

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

diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx
index 48d0d74be1650a9c8a595092bf84f1e838b53ff1..27132588495eb60b321a318365df25ae71dfaead 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -18,15 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include <jssuper.h>
-#include <jsinput.h>
-#include <plib/js.h>
-#include <plib/ul.h>
-
+#include "jsinput.h"
 
 jsInput::jsInput(jsSuper *j) {
   jss=j;
-  pretty_display=false;
+  pretty_display=true;
   joystick=axis=button=-1;
   axis_threshold=0.2;
 }
@@ -38,7 +34,7 @@ int jsInput::getInput(void){
       bool gotit=false;
       
       float delta;
-      int i,current_button=0,button_bits;       
+      int i, current_button = 0, button_bits = 0;
 
       joystick=axis=button=-1;
       
@@ -113,5 +109,7 @@ int jsInput::getInput(void){
           } 
         }    
       } 
+
+      return 0;
 }