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

diff --git a/src/main.c b/src/main.c
index f8077436..aa4d14bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,16 +14,22 @@
 
 #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];
@@ -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;
@@ -59,6 +64,7 @@ int		fading_on = FALSE;
 int		autorecord_on = FALSE;
 int		joystick_nr = 0;
 int		quick_doors = FALSE;
+int		cpu_friendly = TRUE;
 
 BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int		redraw_x1 = 0, redraw_y1 = 0;
@@ -82,14 +88,16 @@ long		Elementeigenschaften[MAX_ELEMENTS];
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-int		FX = SX, FY = SY, ScreenMovPos = 0;
+int		FX = SX, FY = SY, ScreenMovPos = 0, ScrollStepSize = TILEX/8;
+int		GameSpeed = GAME_FRAME_DELAY, MoveSpeed = 8;
 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,Friends;
-int		Dynamite,Key[4],MampferNr;
+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;
 
@@ -187,6 +195,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();