X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=f8077436a2e6bd71f61af6bd2fc566e482a3e651;hb=33df7a5ca87e883c2b718171fd7d05c22fc0353f;hp=0c9d1f18ec99041ea7205fc22e8297175b13ea15;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 0c9d1f18..f8077436 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,6 +16,7 @@
 #include "init.h"
 #include "events.h"
 #include "sound.h"
+#include "joystick.h"
 
 Display        *display;
 int		screen;
@@ -23,8 +24,12 @@ Window  	window;
 GC		gc, clip_gc[NUM_PIXMAPS];
 Pixmap		pix[NUM_PIXMAPS];
 Pixmap		clipmask[NUM_PIXMAPS];
+
+#ifdef XPM_INCLUDE_FILE
 XpmAttributes 	xpm_att[NUM_PICTURES];
-Drawable        drawto, drawto_field, backbuffer;
+#endif
+
+Drawable        drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap	cmap;
 
 int		sound_pipe[2];
@@ -49,12 +54,14 @@ 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[SCR_FIELDX][SCR_FIELDY];
+BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+int		redraw_x1 = 0, redraw_y1 = 0;
 int		redraw_mask;
 int		redraw_tiles;
 
@@ -75,9 +82,14 @@ long		Elementeigenschaften[MAX_ELEMENTS];
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-int		LevelSolved,GameOver, JX,JY, ZX,ZY;
+int		FX = SX, FY = SY, ScreenMovPos = 0;
+int		BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
+int		JX,JY, JX2,JY2, ZX,ZY, ExitX,ExitY;
+int		PlayerMovDir, PlayerMovPos, PlayerFrame, PlayerPushing;
+int		PlayerGone,LevelSolved,GameOver;
 int		FrameCounter,TimeFrames,TimeLeft,Score;
-int		Gems,SokobanFields,Lights,Dynamite,Key[4],MampferNr;
+int		Gems,SokobanFields,Lights,Friends;
+int		Dynamite,Key[4],MampferNr;
 int		DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
 int		SiebAktiv;