X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=6626f7019e4b509e9aed316aa390d659828166e2;hb=c878cb2be6a0bffee850bf4f2dcb1939d5d2cd4f;hp=5d8aa5c05093cfe7ea41e2444affade81901bf26;hpb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 5d8aa5c0..6626f701 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@ GC		gc, clip_gc[NUM_PIXMAPS], tile_clip_gc;
 Pixmap		pix[NUM_PIXMAPS];
 Pixmap		clipmask[NUM_PIXMAPS], tile_clipmask[NUM_TILES];
 
-#ifdef XPM_INCLUDE_FILE
+#ifdef USE_XPM_LIBRARY
 XpmAttributes 	xpm_att[NUM_PICTURES];
 #endif
 
@@ -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;
@@ -94,26 +100,19 @@ int		AllPlayersGone;
 int		FrameCounter, TimeFrames, TimeLeft;
 int		MampferNr, SiebAktiv;
 
-byte		network_player_action[MAX_PLAYERS];
 boolean		network_player_action_received = FALSE;
 int		TestPlayer = 0;
 
 struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
 struct LevelInfo	level;
-struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player;
+struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
 struct RecordingInfo	tape;
 struct OptionInfo	options;
 struct SetupInfo	setup;
-
-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 }
-};
+struct SetupFileList	*setup_list = NULL;
+struct SetupFileList	*level_setup_list = NULL;
 
 /* data needed for playing sounds */
 char *sound_name[NUM_SOUNDS] =