#define WIN_YSIZE 560
#define SCR_FIELDX 17
#define SCR_FIELDY 17
+#define MAX_BUF_XSIZE (SCR_FIELDX + 2)
+#define MAX_BUF_YSIZE (SCR_FIELDY + 2)
#define MIN_LEV_FIELDX (SCR_FIELDX-2)
#define MIN_LEV_FIELDY (SCR_FIELDY-2)
#define SCROLLY(a) ((a)-scroll_y)
#define UNSCROLLX(a) ((a)+scroll_x)
#define UNSCROLLY(a) ((a)+scroll_y)
-#define IN_SCR_FIELD(x,y) ((x)>=0 && (x)<SCR_FIELDX && (y)>=0 &&(y)<SCR_FIELDY)
+#define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
#define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
+
#define IS_PLAYER(x,y) (JX==(x) && JY==(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))
#define IS_FREE_OR_PLAYER(x,y) (Feld[x][y]==EL_LEERRAUM)
#define IS_MOVING(x,y) (MovPos[x][y]!=0)
/* Pixmaps without them */
#define PIX_DB_BACK 6
#define PIX_DB_DOOR 7
+#define PIX_DB_FIELD 8
#define NUM_PICTURES 6
-#define NUM_PIXMAPS 8
+#define NUM_PIXMAPS 9
/* boundaries of arrays etc. */
#define MAX_NAMELEN (10+1)
extern XpmAttributes xpm_att[];
#endif
-extern Drawable drawto, drawto_field, backbuffer;
+extern Drawable drawto, drawto_field, backbuffer, fieldbuffer;
extern Colormap cmap;
extern int sound_pipe[2];
extern int toons_on;
extern int direct_draw_on;
extern int scroll_delay_on;
+extern int soft_scrolling_on;
extern int fading_on;
extern int autorecord_on;
extern int joystick_nr;
extern int quick_doors;
-extern BOOL redraw[SCR_FIELDX][SCR_FIELDY];
+extern BOOL redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+extern int redraw_x1, redraw_y1;
extern int redraw_mask;
extern int redraw_tiles;
extern int level_nr, leveldir_nr, num_leveldirs;
extern int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
-extern int JX,JY, ZX,ZY, ExitX,ExitY;
-extern int PlayerMovDir, PlayerFrame, PlayerPushing;
+extern int FX,FY, ScreenMovPos, ScrollStepSize;
+extern int BX1,BY1, BX2,BY2;
+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;
#define MIDPOSY (SCR_FIELDY/2)
#define SXSIZE (SCR_FIELDX*TILEX)
#define SYSIZE (SCR_FIELDY*TILEY)
+#define FXSIZE ((SCR_FIELDX+2)*TILEX)
+#define FYSIZE ((SCR_FIELDY+2)*TILEY)
#define DXSIZE 100
#define DYSIZE 280
#define VXSIZE DXSIZE
#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"
#define VERSION_STRING "1.1"
#define GAMETITLE_STRING "Rocks'n'Diamonds"
#define WINDOWTITLE_STRING GAMETITLE_STRING " " VERSION_STRING
-#define COPYRIGHT_STRING "Copyright ^1995-97 by Holger Schemel"
+#define COPYRIGHT_STRING "Copyright ^1995-98 by Holger Schemel"
/* Leerer Login- und Alias-Name */
#define EMPTY_LOGIN "NO_LOGIN"
#define REDRAW_VIDEO_2 (1L<<5)
#define REDRAW_VIDEO_3 (1L<<6)
#define REDRAW_MICROLEV (1L<<7)
+#define REDRAW_FROM_BACKBUFFER (1L<<8)
#define REDRAW_DOOR_2 (REDRAW_VIDEO_1 | REDRAW_VIDEO_2 | REDRAW_VIDEO_3)
#define REDRAW_DOORS (REDRAW_DOOR_1 | REDRAW_DOOR_2)
#define REDRAW_MAIN (REDRAW_FIELD | REDRAW_TILES | REDRAW_MICROLEV)
-#define REDRAWTILES_TH SCR_FIELDX*SCR_FIELDY/2
+#define REDRAWTILES_THRESHOLD SCR_FIELDX*SCR_FIELDY/2
/* positions in the game control window */
#define XX_LEVEL 37
/* für DrawGraphicAnimation (tools.c) und AnimateToon (cartoons.c) */
#define ANIM_NORMAL 0
#define ANIM_OSCILLATE 1
+#define ANIM_REVERSE 2
#endif