X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=92de9f7972e52bf06eda9dc1b8f200f5d480a1d2;hb=19e3dfa321d39a822bda8fa489fb76f25f9f9165;hp=90dcd6d2672a2feb1f827e4bd0c4efb06e390d23;hpb=19b6c35938826bfd71478d7ddaf1a4729420d3b2;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 90dcd6d2..92de9f79 100644
--- a/src/main.h
+++ b/src/main.h
@@ -71,7 +71,7 @@ typedef int BOOL;
 #define IS_PLAYER(x,y)		(JX==(x) && JY==(y))
 
 /*
-#define IS_PLAYER(x,y)		((JX==(x) && JY==(y)) || (JX2==(x) && JY2==(y)))
+#define IS_PLAYER(x,y)		((JX==(x) && JY==(y)) || (lastJX==(x) && lastJY==(y)))
 */
 
 #define IS_FREE(x,y)		(Feld[x][y]==EL_LEERRAUM && !IS_PLAYER(x,y))
@@ -306,10 +306,11 @@ extern long		Elementeigenschaften[MAX_ELEMENTS];
 extern int		level_nr, leveldir_nr, num_leveldirs;
 extern int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-extern int		FX,FY, ScreenMovPos;
+extern int		FX,FY, ScreenMovPos, ScrollSteps;
 extern int		BX1,BY1, BX2,BY2;
-extern int		JX,JY, JX2,JY2, ZX,ZY, ExitX,ExitY;
-extern int		PlayerMovDir, PlayerMovPos, PlayerFrame, PlayerPushing;
+extern int		JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
+extern int		PlayerMovDir, PlayerMovPos, PlayerPushing;
+extern int		PlayerFrame, PlayerGfxPos;
 extern int		PlayerGone,LevelSolved,GameOver;
 extern int		FrameCounter,TimeFrames,TimeLeft,Score;
 extern int		Gems,SokobanFields,Lights,Friends;
@@ -565,6 +566,7 @@ extern char		*progname;
 #define EL_AMOEBING		305
 #define EL_MAUERND		306
 #define EL_BURNING		307
+#define EL_PLAYER_IS_LEAVING	308
 
 /* game graphics:
 **	  0 - 255: graphics from "RocksScreen"