Don't restore initial screen geometry because there is nothing in fg_os* to resize...

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

diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx
index 5bf12a4c5ab0d3fb343648f946efc7e8d34e9114..1b10ba106b4da182a25e4a23541094479c6c65d8 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -16,20 +16,20 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#include <jsinput.h>
+#include "jsinput.h"
 
 jsInput::jsInput(jsSuper *j) {
   jss=j;
-  pretty_display=false;
+  pretty_display=true;
   joystick=axis=button=-1;
   axis_threshold=0.2;
 }
 
 jsInput::~jsInput(void) {}
 
-int jsInput::getInput(void){
+int jsInput::getInput(){
       
       bool gotit=false;
       
@@ -37,6 +37,7 @@ int jsInput::getInput(void){
       int i, current_button = 0, button_bits = 0;
 
       joystick=axis=button=-1;
+      axis_positive=false;
       
       if(pretty_display) {
           printf ( "+----------------------------------------------\n" ) ;
@@ -79,6 +80,7 @@ int jsInput::getInput(void){
                 gotit=true;
                 joystick=jss->getCurrentJoystickId();
                 axis=i;
+               axis_positive=(delta>0);
               } else if( current_button != 0 ) {
                 gotit=true;
                 joystick=jss->getCurrentJoystickId();  
@@ -102,7 +104,7 @@ int jsInput::getInput(void){
         ulMilliSecondSleep(1);
       }
       if(button_bits != 0) {
-        for(int i=1;i<=31;i++) {
+        for(int i=0;i<=31;i++) {
           if( ( button_bits & (1 << i) ) > 0 ) {
              button=i;
              break;