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

diff --git a/src/main.c b/src/main.c
index 2395ec1b..302b5418 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,6 +14,7 @@
 
 #include "main.h"
 #include "init.h"
+#include "game.h"
 #include "events.h"
 #include "sound.h"
 #include "joystick.h"
@@ -23,18 +24,13 @@
 #endif
 
 Display        *display;
+Visual	       *visual;
 int		screen;
 Window  	window;
 GC		gc, clip_gc[NUM_PIXMAPS];
 Pixmap		pix[NUM_PIXMAPS];
 Pixmap		clipmask[NUM_PIXMAPS];
 
-
-Pixmap		test_pix[NUM_PICTURES];
-Pixmap		test_clipmask[NUM_PICTURES];
-int		test_picture_count = 0;
-
-
 #ifdef XPM_INCLUDE_FILE
 XpmAttributes 	xpm_att[NUM_PICTURES];
 #endif
@@ -93,6 +89,7 @@ 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		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;