X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=d5c5014887ff19eb1a30158e1916472531ef4102;hb=f45528c08776cd2c87a83bf3ec7e1f7fe7b18765;hp=302b5418e8d7e87878eb8c1948dd8e9de23d5742;hpb=4b0c6356359ee52f98cee8fa578179c6c41d4ef1;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 302b5418..d5c50148 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,9 +27,9 @@ Display        *display;
 Visual	       *visual;
 int		screen;
 Window  	window;
-GC		gc, clip_gc[NUM_PIXMAPS];
+GC		gc, clip_gc[NUM_PIXMAPS], tile_clip_gc;
 Pixmap		pix[NUM_PIXMAPS];
-Pixmap		clipmask[NUM_PIXMAPS];
+Pixmap		clipmask[NUM_PIXMAPS], tile_clipmask[NUM_TILES];
 
 #ifdef XPM_INCLUDE_FILE
 XpmAttributes 	xpm_att[NUM_PICTURES];
@@ -45,7 +45,6 @@ int		joystick_device = 0;
 char	       *joystick_device_name[2] = { DEV_JOYSTICK_0, DEV_JOYSTICK_1 };
 char	       *level_directory = LEVEL_PATH;
 int     	width, height;
-unsigned long	pen_fg, pen_bg;
 
 int		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
@@ -78,6 +77,7 @@ 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];
@@ -89,21 +89,17 @@ int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
 int		FX = SX, FY = SY, ScreenMovPos = 0, ScrollStepSize = TILEX/8;
-int		GameSpeed = GAME_FRAME_DELAY, MoveSpeed = 8;
+int		GameFrameDelay = GAME_FRAME_DELAY, MoveSpeed = 8;
 int		BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
-int		JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
-int		PlayerMovDir, PlayerMovPos, PlayerPushing;
-int		PlayerFrame, PlayerGfxPos;
-int		PlayerGone, LevelSolved, GameOver;
-int		FrameCounter, TimeFrames, TimeLeft, Score;
-int		Gems, SokobanFields, Lights, Friends;
-int		Dynamite, Key[4], MampferNr;
-int		DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
-int		SiebAktiv;
+int		ZX,ZY, ExitX,ExitY;
+int		AllPlayersGone;
+int		FrameCounter, TimeFrames, TimeLeft;
+int		MampferNr, SiebAktiv;
 
 struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
 struct LevelInfo	level;
-struct PlayerInfo	player;
+struct PlayerInfo	stored_player[MAX_PLAYERS+1];
+struct PlayerInfo      *local_player;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
 struct RecordingInfo	tape;