rnd-19980915

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 08ee469ef6738edae465790c08818f1aee52b2f8..302b5418e8d7e87878eb8c1948dd8e9de23d5742 100644 (file)
--- 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"
@@ -30,12 +31,6 @@ 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
@@ -94,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;