X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=969947e10f08aa3baa0aea88eaaea551c2e2cffc;hp=61039723459de7e82fd6f203e5a0a1c49c03957e;hb=3dc317d10b44cc6b75db10ac194966ad8114d390;hpb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c

diff --git a/src/main.c b/src/main.c
index 61039723..969947e1 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,55 +42,50 @@ 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;
-char	       *display_name = NULL;
-char	       *server_host = NULL;
-int		server_port = 0;
-int		standalone = TRUE;
-int		verbose = FALSE;
 
 int		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
-int		button_status = MB_NOT_PRESSED, motion_status = FALSE;
+boolean		network_playing = FALSE;
+int		button_status = MB_NOT_PRESSED;
+boolean		motion_status = FALSE;
 int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
 int	    	joystick_status = JOYSTICK_STATUS;
-int	    	sound_status = SOUND_STATUS, sound_on = TRUE;
-int		sound_loops_allowed = FALSE, sound_loops_on = FALSE;
-int		sound_music_on = FALSE;
-int		sound_simple_on = FALSE;
-int		toons_on = TRUE;
-int		direct_draw_on = FALSE;
-int		scroll_delay_on = FALSE;
-int		soft_scrolling_on = TRUE;
-int		fading_on = FALSE;
-int		autorecord_on = FALSE;
-int		joystick_nr = 0;
-int		quick_doors = FALSE;
-
-BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+int	    	sound_status = SOUND_STATUS;
+boolean		sound_loops_allowed = FALSE;
+
+boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int		redraw_x1 = 0, redraw_y1 = 0;
 int		redraw_mask;
 int		redraw_tiles;
 
-int		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
-long		Elementeigenschaften[MAX_ELEMENTS];
+short		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+unsigned long	Elementeigenschaften[MAX_ELEMENTS];
 
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
@@ -98,32 +93,28 @@ 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];
-BOOL		network_player_action_stored = FALSE;
+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 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 OptionInfo	options;
+struct SetupInfo	setup;
+struct SetupFileList	*setup_list = NULL;
+struct SetupFileList	*level_setup_list = NULL;
 
 /* data needed for playing sounds */
 char *sound_name[NUM_SOUNDS] =