X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a0483461e302bf798c45bba8f6c3ae446f9a1f53;hb=34efaa3925a28cb95ecb05bf2c693c16f6edfe2f;hp=48fcc7c71a96109c0b1dd8bd66d68fd021871aba;hpb=e5c5bf5c4a76a04f9bf64e92227bf2ef969fd25c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 48fcc7c7..a0483461 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,17 @@ 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		network_playing = FALSE;
 int		button_status = MB_NOT_PRESSED;
 boolean		motion_status = FALSE;
@@ -85,34 +88,27 @@ int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 int		FX = SX, FY = SY, ScrollStepSize = TILEX/8;
 int		ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
 int		ScreenGfxPos = 0;
-int		GameFrameDelay = GAME_FRAME_DELAY, MoveSpeed = 8;
+int		GameFrameDelay = GAME_FRAME_DELAY;
+int		FfwdFrameDelay = FFWD_FRAME_DELAY;
+int		MoveSpeed = 8;
 int		BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
 int		ZX,ZY, ExitX,ExitY;
 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+1];
-struct PlayerInfo      *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 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] =