rnd-19981017-1

[rocksndiamonds.git] / src / joystick.c

diff --git a/src/joystick.c b/src/joystick.c
index 3855400d814eeacbac23662117a465813ec6b361..3e2b3abd698f5eb2ce50cc36926d9055cd12bb05 100644 (file)
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  joystick.c                                              *
 ***********************************************************/
@@ -16,16 +16,7 @@
 #endif
 
 #include "joystick.h"
-
-/*
-#include "tools.h"
-#include "game.h"
-#include "events.h"
-#include "sound.h"
 #include "misc.h"
-#include "buttons.h"
-#include <math.h>
-*/
 
 void CheckJoystickData()
 {
@@ -90,10 +81,10 @@ int Joystick()
   if (joystick_status==JOYSTICK_OFF)
     return(0);
 
+#ifndef MSDOS
   if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
   {
-    fprintf(stderr,"%s: cannot read joystick settings - no joystick support\n",
-           progname);
+    Error(ERR_RETURN, "cannot read joystick settings - no joystick support");
     joystick_status = JOYSTICK_OFF;
     return(0);
   }
@@ -108,14 +99,14 @@ int Joystick()
   js_b2 = joy_ctrl.buttons & 2;
 #endif
 
-  left = JoystickPosition(joystick[joystick_nr].xmiddle,
-                         joystick[joystick_nr].xleft,  js_x);
-  right = JoystickPosition(joystick[joystick_nr].xmiddle,
-                          joystick[joystick_nr].xright, js_x);
-  up =    JoystickPosition(joystick[joystick_nr].ymiddle,
-                          joystick[joystick_nr].yupper, js_y);
-  down =  JoystickPosition(joystick[joystick_nr].ymiddle,
-                          joystick[joystick_nr].ylower, js_y);
+  left = JoystickPosition(joystick[setup.joystick_nr].xmiddle,
+                         joystick[setup.joystick_nr].xleft,  js_x);
+  right = JoystickPosition(joystick[setup.joystick_nr].xmiddle,
+                          joystick[setup.joystick_nr].xright, js_x);
+  up =    JoystickPosition(joystick[setup.joystick_nr].ymiddle,
+                          joystick[setup.joystick_nr].yupper, js_y);
+  down =  JoystickPosition(joystick[setup.joystick_nr].ymiddle,
+                          joystick[setup.joystick_nr].ylower, js_y);
 
   if (left>JOYSTICK_PERCENT)
     result |= JOY_LEFT;
@@ -131,6 +122,9 @@ int Joystick()
     result |= JOY_BUTTON_2;
 
   return(result);
+#else
+  return(0);
+#endif
 }
 
 int JoystickButton()