X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=b52761b3722d9f63801da2c622c14f98edcdfec6;hb=34b9fd6b89ffe8fa0637840118b43e4d36bb1798;hp=2db25f2eecdc237fa2b245c3c762e262836bd6d9;hpb=b7d31643c9c84104fb3ebef778e545928610ff65;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 2db25f2e..b52761b3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,22 +14,28 @@
 
 #include "main.h"
 #include "init.h"
+#include "game.h"
 #include "events.h"
 #include "sound.h"
 #include "joystick.h"
 
+#ifdef MSDOS
+#include <fcntl.h>
+#endif
+
 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];
 #endif
 
-Drawable        drawto, drawto_field, backbuffer;
+Drawable        drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap	cmap;
 
 int		sound_pipe[2];
@@ -39,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;
@@ -54,12 +59,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;
 
@@ -80,18 +87,20 @@ long		Elementeigenschaften[MAX_ELEMENTS];
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-int		JX,JY, ZX,ZY, ExitX,ExitY;
-int		PlayerMovDir, PlayerFrame, PlayerPushing;
-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		FX = SX, FY = SY, ScreenMovPos = 0, ScrollStepSize = TILEX/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;
+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, *actual_player;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
 struct RecordingInfo	tape;
@@ -183,6 +192,10 @@ int main(int argc, char *argv[])
   if (argc>1)
     level_directory = argv[1];
 
+#ifdef MSDOS
+  _fmode = O_BINARY;
+#endif
+
   OpenAll(argc,argv);
   EventLoop();
   CloseAll();