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 c7ea809e83d22664ae736b1f1d43ff8747693001..27132588495eb60b321a318365df25ae71dfaead 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include <jsinput.h>
+#include "jsinput.h"
 
 jsInput::jsInput(jsSuper *j) {
   jss=j;
@@ -101,7 +101,6 @@ int jsInput::getInput(void){
 
         ulMilliSecondSleep(1);
       }
-#if 0
       if(button_bits != 0) {
         for(int i=1;i<=31;i++) {
           if( ( button_bits & (1 << i) ) > 0 ) {
@@ -110,9 +109,6 @@ int jsInput::getInput(void){
           } 
         }    
       } 
-#else
-      button = button_bits;
-#endif
 
       return 0;
 }