rnd-19981108-2

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 74650e2b2809c1f19649ebbf2cc75a737d43d9fd..be179b53be95de09c069970bd5dc4c8682e33d8b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -42,8 +42,14 @@ int          sound_pipe[2];
 int            sound_device;
 char          *sound_device_name = SOUND_DEVICE;
 int            joystick_device = 0;
-char          *joystick_device_name[2] = { DEV_JOYSTICK_0, DEV_JOYSTICK_1 };
-char          *level_directory = LEVEL_PATH;
+char          *joystick_device_name[MAX_PLAYERS] =
+{
+  DEV_JOYSTICK_0,
+  DEV_JOYSTICK_1,
+  DEV_JOYSTICK_2,
+  DEV_JOYSTICK_3
+};
+
 int            width, height;
 
 char          *program_name = NULL;
@@ -108,14 +114,6 @@ struct SetupInfo   setup;
 struct SetupFileList   *setup_list = NULL;
 struct SetupFileList   *level_setup_list = NULL;
 
-struct JoystickInfo joystick[2] =
-{
-  { JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
-    JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE },
-  { JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
-    JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE }
-};
-
 /* data needed for playing sounds */
 char *sound_name[NUM_SOUNDS] =
 {