X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=21f165a9789dbef06538fca4aa4ee7b03328d49e;hb=6fe98dc77891e9fc45cbd99bbd4793e2133c6960;hp=509e038f41914eeb21a7c294500daf97f54baa98;hpb=d7d97176a88ee47f893055480c76b9c05a253d05;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 509e038f..21f165a9 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,14 +42,18 @@ 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;
-int     	width, height;
+char	       *joystick_device_name[MAX_PLAYERS] =
+{
+  DEV_JOYSTICK_0,
+  DEV_JOYSTICK_1,
+  DEV_JOYSTICK_2,
+  DEV_JOYSTICK_3
+};
 
 char	       *program_name = NULL;
 
 int		game_status = MAINMENU;
-int		game_emulation = EMU_NONE;
+boolean		level_editor_test_game = FALSE;
 boolean		network_playing = FALSE;
 int		button_status = MB_NOT_PRESSED;
 boolean		motion_status = FALSE;
@@ -95,24 +99,17 @@ int		FrameCounter, TimeFrames, TimeLeft;
 int		MampferNr, SiebAktiv;
 
 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 = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
-struct RecordingInfo	tape;
+struct TapeInfo		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] =