rnd-19981006-2

[rocksndiamonds.git] / src / joystick.c

diff --git a/src/joystick.c b/src/joystick.c
index 0e1a42cd969b056933bd5589f6cc3e403fe4bc07..86fabec7fa4fb753351e4fe6b41335a45461d4b1 100644 (file)
--- a/src/joystick.c
+++ b/src/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()
 {
@@ -93,8 +84,7 @@ int Joystick()
 #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);
   }