X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=f117a856bcd3ef5a81d0852ae091f217cae202cb;hb=1e196be4c0a2f1edf823b3a0e5a14a146317686e;hp=8cd26a117ba0cbb635ae8b05af7d80785d7e0054;hpb=2357c391b4a587709627cc30316734b3c83c8134;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 8cd26a11..f117a856 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
 
@@ -50,13 +50,10 @@ char	       *joystick_device_name[MAX_PLAYERS] =
   DEV_JOYSTICK_3
 };
 
-char	       *level_directory = LEVEL_PATH;
-int     	width, height;
-
 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;
@@ -92,24 +89,30 @@ 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		BorderElement = EL_BETON;
 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		SBX_Left, SBX_Middle, SBX_Right;
+int		SBY_Upper, SBY_Middle, SBY_Lower;
 int		ZX,ZY, ExitX,ExitY;
 int		AllPlayersGone;
-int		FrameCounter, TimeFrames, TimeLeft;
-int		MampferNr, SiebAktiv;
+int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
+int		MampferMax, MampferNr;
+boolean		SiebAktiv;
+int		SiebCount;
+
+int		game_emulation = EMU_NONE;
 
 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 SetupFileList	*setup_list = NULL;
@@ -169,7 +172,16 @@ char *sound_name[NUM_SOUNDS] =
   "voyager",
   "warnton",
   "whoosh",
-  "zisch"
+  "zisch",
+  "base",
+  "infotron",
+  "zonkdown",
+  "zonkpush",
+  "bug",
+  "boom",
+  "booom",
+  "exit",
+  "empty"
 };
 
 /* background music */