X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fmisc.c;h=572ff3601a8efce0d9eb8d119000025e9dc61724;hb=1465ca1ffdf2104d25b9a46ca9bf8a3f175403fd;hp=bfc6d454d9652253e9766676960913783c469a9c;hpb=da14f69fd95c7bd5a0d70cdf4935af06f1f20a04;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index bfc6d454..572ff360 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -17,6 +17,8 @@
 #include <stdarg.h>
 #include <ctype.h>
 
+#include "libgame.h"
+
 #if !defined(PLATFORM_WIN32)
 #include <pwd.h>
 #include <sys/param.h>
@@ -28,7 +30,9 @@
 
 #include "misc.h"
 
+#if 0
 #include "joystick_TMP.h"
+#endif
 
 #if defined(PLATFORM_MSDOS)
 volatile unsigned long counter = 0;
@@ -1056,90 +1060,6 @@ char getCharFromKey(Key key)
   return letter;
 }
 
-#define TRANSLATE_JOYSYMBOL_TO_JOYNAME	0
-#define TRANSLATE_JOYNAME_TO_JOYSYMBOL	1
-
-void translate_joyname(int *joysymbol, char **name, int mode)
-{
-  static struct
-  {
-    int joysymbol;
-    char *name;
-  } translate_joy[] =
-  {
-    { JOY_LEFT,		"joystick_left" },
-    { JOY_RIGHT,	"joystick_right" },
-    { JOY_UP,		"joystick_up" },
-    { JOY_DOWN,		"joystick_down" },
-    { JOY_BUTTON_1,	"joystick_button_1" },
-    { JOY_BUTTON_2,	"joystick_button_2" },
-  };
-
-  int i;
-
-  if (mode == TRANSLATE_JOYSYMBOL_TO_JOYNAME)
-  {
-    *name = "[undefined]";
-
-    for (i=0; i<6; i++)
-    {
-      if (*joysymbol == translate_joy[i].joysymbol)
-      {
-	*name = translate_joy[i].name;
-	break;
-      }
-    }
-  }
-  else if (mode == TRANSLATE_JOYNAME_TO_JOYSYMBOL)
-  {
-    *joysymbol = 0;
-
-    for (i=0; i<6; i++)
-    {
-      if (strcmp(*name, translate_joy[i].name) == 0)
-      {
-	*joysymbol = translate_joy[i].joysymbol;
-	break;
-      }
-    }
-  }
-}
-
-char *getJoyNameFromJoySymbol(int joysymbol)
-{
-  char *name;
-
-  translate_joyname(&joysymbol, &name, TRANSLATE_JOYSYMBOL_TO_JOYNAME);
-  return name;
-}
-
-int getJoySymbolFromJoyName(char *name)
-{
-  int joysymbol;
-
-  translate_joyname(&joysymbol, &name, TRANSLATE_JOYNAME_TO_JOYSYMBOL);
-  return joysymbol;
-}
-
-int getJoystickNrFromDeviceName(char *device_name)
-{
-  char c;
-  int joystick_nr = 0;
-
-  if (device_name == NULL || device_name[0] == '\0')
-    return 0;
-
-  c = device_name[strlen(device_name) - 1];
-
-  if (c >= '0' && c <= '9')
-    joystick_nr = (int)(c - '0');
-
-  if (joystick_nr < 0 || joystick_nr >= MAX_PLAYERS)
-    joystick_nr = 0;
-
-  return joystick_nr;
-}
-
 /* ------------------------------------------------------------------------- */
 /* some functions to handle lists of level directories                       */
 /* ------------------------------------------------------------------------- */