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

diff --git a/src/main.c b/src/main.c
index 0e3f612b..aa4d14bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,18 +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, plane_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];
-Drawable        drawto, drawto_field, backbuffer;
+#endif
+
+Drawable        drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap	cmap;
 
 int		sound_pipe[2];
@@ -33,25 +43,31 @@ int		sound_device;
 char	       *sound_device_name = SOUND_DEVICE;
 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;
 int		button_status = MB_NOT_PRESSED, motion_status = FALSE;
-int		key_status = KEY_NOT_PRESSED;
+int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
 int	    	joystick_status = JOYSTICK_STATUS;
-int	    	sound_status = SOUND_STATUS, sound_on=TRUE;
+int	    	sound_status = SOUND_STATUS, sound_on = TRUE;
 int		sound_loops_allowed = FALSE, sound_loops_on = FALSE;
 int		sound_music_on = FALSE;
+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;
+int		cpu_friendly = TRUE;
 
-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;
 
@@ -64,31 +80,40 @@ int		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		Store2[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];
 int		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int		AmoebaCnt[MAX_NUM_AMOEBA];
+int		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
 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		Gems,Dynamite,Key[4],TimeLeft,Score,MampferNr;
-int		CheckMoving,CheckExploding, SiebAktiv;
+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, 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;
 
 struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
 struct LevelInfo	level;
 struct PlayerInfo	player;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
-struct RecordingInfo	tape,master_tape;
+struct RecordingInfo	tape;
 
 struct JoystickInfo joystick[2] =
 {
-  JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
-  JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE,
-
-  JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
-  JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE
+  { JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
+    JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE },
+  { JOYSTICK_XLEFT, JOYSTICK_XRIGHT, JOYSTICK_XMIDDLE,
+    JOYSTICK_YUPPER, JOYSTICK_YLOWER, JOYSTICK_YMIDDLE }
 };
 
 /* data needed for playing sounds */
@@ -167,6 +192,13 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
 
+  if (argc>1)
+    level_directory = argv[1];
+
+#ifdef MSDOS
+  _fmode = O_BINARY;
+#endif
+
   OpenAll(argc,argv);
   EventLoop();
   CloseAll();