X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=ab26aad533650a1b19010a500a4d249185d6b184;hb=2fe139696892ee39f804b5c7315b8f0977ab01ec;hp=d768084314f78a8dbd4207b30db9705f81984387;hpb=7514f7e38db461e91e4c93a1a7146b700638763a;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index d7680843..ab26aad5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -71,8 +71,6 @@ typedef unsigned char byte;
 #define STD_LEV_FIELDY	32
 #define MAX_LEV_FIELDX	128
 #define MAX_LEV_FIELDY	128
-#define ED_FIELDX	(2 * SCR_FIELDX - 1)
-#define ED_FIELDY	(2 * SCR_FIELDY - 2)
 
 #define MAX_PLAYERS	4
 
@@ -97,6 +95,7 @@ typedef unsigned char byte;
 #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)
 
+/* values for 'Elementeigenschaften1' */
 #define EP_BIT_AMOEBALIVE	(1 << 0)
 #define EP_BIT_AMOEBOID		(1 << 1)
 #define EP_BIT_SCHLUESSEL	(1 << 2)
@@ -126,36 +125,48 @@ typedef unsigned char byte;
 #define EP_BIT_HAS_CONTENT	(1 << 26)
 #define EP_BIT_EATABLE		(1 << 27)
 #define EP_BIT_SP_ELEMENT	(1 << 28)
-
-#define IS_AMOEBALIVE(e)	(Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
-#define IS_AMOEBOID(e)		(Elementeigenschaften[e] & EP_BIT_AMOEBOID)
-#define IS_SCHLUESSEL(e)	(Elementeigenschaften[e] & EP_BIT_SCHLUESSEL)
-#define IS_PFORTE(e)		(Elementeigenschaften[e] & EP_BIT_PFORTE)
-#define IS_SOLID(e)		(Elementeigenschaften[e] & EP_BIT_SOLID)
-#define IS_MASSIVE(e)		(Elementeigenschaften[e] & EP_BIT_MASSIVE)
-#define IS_SLIPPERY(e)		(Elementeigenschaften[e] & EP_BIT_SLIPPERY)
-#define IS_ENEMY(e)		(Elementeigenschaften[e] & EP_BIT_ENEMY)
-#define IS_MAUER(e)		(Elementeigenschaften[e] & EP_BIT_MAUER)
-#define CAN_FALL(e)		(Elementeigenschaften[e] & EP_BIT_CAN_FALL)
-#define CAN_SMASH(e)		(Elementeigenschaften[e] & EP_BIT_CAN_SMASH)
-#define CAN_CHANGE(e)		(Elementeigenschaften[e] & EP_BIT_CAN_CHANGE)
-#define CAN_MOVE(e)		(Elementeigenschaften[e] & EP_BIT_CAN_MOVE)
-#define COULD_MOVE(e)		(Elementeigenschaften[e] & EP_BIT_COULD_MOVE)
-#define DONT_TOUCH(e)		(Elementeigenschaften[e] & EP_BIT_DONT_TOUCH)
-#define DONT_GO_TO(e)		(Elementeigenschaften[e] & EP_BIT_DONT_GO_TO)
-#define IS_MAMPF2(e)		(Elementeigenschaften[e] & EP_BIT_MAMPF2)
-#define IS_CHAR(e)		(Elementeigenschaften[e] & EP_BIT_CHAR)
-#define IS_BD_ELEMENT(e)	(Elementeigenschaften[e] & EP_BIT_BD_ELEMENT)
-#define IS_SB_ELEMENT(e)	(Elementeigenschaften[e] & EP_BIT_SB_ELEMENT)
-#define IS_GEM(e)		(Elementeigenschaften[e] & EP_BIT_GEM)
-#define IS_INACTIVE(e)		(Elementeigenschaften[e] & EP_BIT_INACTIVE)
-#define IS_EXPLOSIVE(e)		(Elementeigenschaften[e] & EP_BIT_EXPLOSIVE)
-#define IS_MAMPF3(e)		(Elementeigenschaften[e] & EP_BIT_MAMPF3)
-#define IS_PUSHABLE(e)		(Elementeigenschaften[e] & EP_BIT_PUSHABLE)
-#define ELEM_IS_PLAYER(e)	(Elementeigenschaften[e] & EP_BIT_PLAYER)
-#define HAS_CONTENT(e)		(Elementeigenschaften[e] & EP_BIT_HAS_CONTENT)
-#define IS_EATABLE(e)		(Elementeigenschaften[e] & EP_BIT_EATABLE)
-#define IS_SP_ELEMENT(e)	(Elementeigenschaften[e] & EP_BIT_SP_ELEMENT)
+#define EP_BIT_QUICK_GATE	(1 << 29)
+#define EP_BIT_OVER_PLAYER	(1 << 30)
+#define EP_BIT_ACTIVE_BOMB	(1 << 31)
+
+/* values for 'Elementeigenschaften2' */
+#define EP_BIT_BELT		(1 << 0)
+#define EP_BIT_BELT_SWITCH	(1 << 1)
+
+#define IS_AMOEBALIVE(e)	(Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE)
+#define IS_AMOEBOID(e)		(Elementeigenschaften1[e] & EP_BIT_AMOEBOID)
+#define IS_SCHLUESSEL(e)	(Elementeigenschaften1[e] & EP_BIT_SCHLUESSEL)
+#define IS_PFORTE(e)		(Elementeigenschaften1[e] & EP_BIT_PFORTE)
+#define IS_SOLID(e)		(Elementeigenschaften1[e] & EP_BIT_SOLID)
+#define IS_MASSIVE(e)		(Elementeigenschaften1[e] & EP_BIT_MASSIVE)
+#define IS_SLIPPERY(e)		(Elementeigenschaften1[e] & EP_BIT_SLIPPERY)
+#define IS_ENEMY(e)		(Elementeigenschaften1[e] & EP_BIT_ENEMY)
+#define IS_MAUER(e)		(Elementeigenschaften1[e] & EP_BIT_MAUER)
+#define CAN_FALL(e)		(Elementeigenschaften1[e] & EP_BIT_CAN_FALL)
+#define CAN_SMASH(e)		(Elementeigenschaften1[e] & EP_BIT_CAN_SMASH)
+#define CAN_CHANGE(e)		(Elementeigenschaften1[e] & EP_BIT_CAN_CHANGE)
+#define CAN_MOVE(e)		(Elementeigenschaften1[e] & EP_BIT_CAN_MOVE)
+#define COULD_MOVE(e)		(Elementeigenschaften1[e] & EP_BIT_COULD_MOVE)
+#define DONT_TOUCH(e)		(Elementeigenschaften1[e] & EP_BIT_DONT_TOUCH)
+#define DONT_GO_TO(e)		(Elementeigenschaften1[e] & EP_BIT_DONT_GO_TO)
+#define IS_MAMPF2(e)		(Elementeigenschaften1[e] & EP_BIT_MAMPF2)
+#define IS_CHAR(e)		(Elementeigenschaften1[e] & EP_BIT_CHAR)
+#define IS_BD_ELEMENT(e)	(Elementeigenschaften1[e] & EP_BIT_BD_ELEMENT)
+#define IS_SB_ELEMENT(e)	(Elementeigenschaften1[e] & EP_BIT_SB_ELEMENT)
+#define IS_GEM(e)		(Elementeigenschaften1[e] & EP_BIT_GEM)
+#define IS_INACTIVE(e)		(Elementeigenschaften1[e] & EP_BIT_INACTIVE)
+#define IS_EXPLOSIVE(e)		(Elementeigenschaften1[e] & EP_BIT_EXPLOSIVE)
+#define IS_MAMPF3(e)		(Elementeigenschaften1[e] & EP_BIT_MAMPF3)
+#define IS_PUSHABLE(e)		(Elementeigenschaften1[e] & EP_BIT_PUSHABLE)
+#define ELEM_IS_PLAYER(e)	(Elementeigenschaften1[e] & EP_BIT_PLAYER)
+#define HAS_CONTENT(e)		(Elementeigenschaften1[e] & EP_BIT_HAS_CONTENT)
+#define IS_EATABLE(e)		(Elementeigenschaften1[e] & EP_BIT_EATABLE)
+#define IS_SP_ELEMENT(e)	(Elementeigenschaften1[e] & EP_BIT_SP_ELEMENT)
+#define IS_QUICK_GATE(e)	(Elementeigenschaften1[e] & EP_BIT_QUICK_GATE)
+#define IS_OVER_PLAYER(e)	(Elementeigenschaften1[e] & EP_BIT_OVER_PLAYER)
+#define IS_ACTIVE_BOMB(e)	(Elementeigenschaften1[e] & EP_BIT_ACTIVE_BOMB)
+#define IS_BELT(e)		(Elementeigenschaften2[e] & EP_BIT_BELT)
+#define IS_BELT_SWITCH(e)	(Elementeigenschaften2[e] & EP_BIT_BELT_SWITCH)
 
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
@@ -163,6 +174,7 @@ typedef unsigned char byte;
 #define IS_FREE_OR_PLAYER(x,y)	(Feld[x][y] == EL_LEERRAUM)
 
 #define IS_MOVING(x,y)		(MovPos[x][y] != 0)
+#define IS_FALLING(x,y)		(MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
 #define IS_BLOCKED(x,y)		(Feld[x][y] == EL_BLOCKED)
 
 #define EL_CHANGED(e)		((e) == EL_FELSBROCKEN    ? EL_EDELSTEIN :  \
@@ -180,31 +192,38 @@ typedef unsigned char byte;
 
 #define PLAYERINFO(x,y)		(&stored_player[StorePlayer[x][y]-EL_SPIELER1])
 
-/* Pixmaps with Xpm or X11 Bitmap files */
+/* Pixmaps with graphic file */
 #define PIX_BACK		0
 #define PIX_DOOR		1
 #define PIX_HEROES		2
 #define PIX_TOONS		3
-#define PIX_MORE		4
-#define	PIX_BIGFONT		5
-#define PIX_SMALLFONT		6
-/* Pixmaps without them */
-#define PIX_DB_BACK		7
-#define PIX_DB_DOOR		8
-#define PIX_DB_FIELD		9
-
-#define NUM_PICTURES		7
+#define PIX_SP			4
+#define PIX_DC			5
+#define	PIX_BIGFONT		6
+#define PIX_SMALLFONT		7
+/* Pixmaps without graphic file */
+#define PIX_DB_BACK		8
+#define PIX_DB_DOOR		9
+#define PIX_DB_FIELD		10
+
+#define NUM_PICTURES		8
 #define NUM_PIXMAPS		10
 
 /* boundaries of arrays etc. */
-#define MAX_NAMELEN		(10+1)
-#define MAX_LEVNAMLEN		32
+#define MAX_PLAYER_NAME_LEN	10
+#define MAX_LEVEL_NAME_LEN	32
+#define MAX_LEVEL_AUTHOR_LEN	32
 #define MAX_TAPELEN		(1000 * 50)	/* max. time * framerate */
 #define MAX_LEVDIR_ENTRIES	100
 #define MAX_SCORE_ENTRIES	100
-#define MAX_ELEMENTS		512
+#define MAX_ELEMENTS		700		/* 500 static + 200 runtime */
 #define MAX_NUM_AMOEBA		100
 
+/* values for elements with content */
+#define MIN_ELEMENT_CONTENTS	1
+#define STD_ELEMENT_CONTENTS	4
+#define MAX_ELEMENT_CONTENTS	8
+
 #define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
 
 /* fundamental game speed values */
@@ -212,10 +231,12 @@ typedef unsigned char byte;
 #define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
 #define FRAMES_PER_SECOND	(1000 / GAME_FRAME_DELAY)
 #define GADGET_FRAME_DELAY	150	/* delay between gadget actions */
+#define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
+#define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
 
 struct HiScore
 {
-  char Name[MAX_NAMELEN];
+  char Name[MAX_PLAYER_NAME_LEN + 1];
   int Score;
 };
 
@@ -224,7 +245,8 @@ struct OptionInfo
   char *display_name;
   char *server_host;
   int server_port;
-  char *base_directory;
+  char *ro_base_directory;
+  char *rw_base_directory;
   char *level_directory;
   boolean serveronly;
   boolean network;
@@ -297,6 +319,8 @@ struct PlayerInfo
   byte effective_action;	/* action aknowledged from network server
 				   or summarized over all configured input
 				   devices when in single player mode */
+  byte programmed_action;	/* action forced by game itself (like moving
+				   through doors); overrides other actions */
 
   int joystick_fd;		/* file descriptor of player's joystick */
 
@@ -305,10 +329,13 @@ struct PlayerInfo
   int Frame;
 
   boolean Pushing;
-  boolean gone, LevelSolved, GameOver;
+  boolean Switching;
+  boolean LevelSolved, GameOver;
   boolean snapped;
 
   unsigned long move_delay;
+  int move_delay_value;
+
   int last_move_dir;
 
   unsigned long push_delay;
@@ -333,27 +360,35 @@ struct LevelInfo
   int fieldx;
   int fieldy;
   int time;
-  int edelsteine;
-  char name[MAX_LEVNAMLEN];
+  int gems_needed;
+  char name[MAX_LEVEL_NAME_LEN + 1];
+  char author[MAX_LEVEL_AUTHOR_LEN + 1];
   int score[LEVEL_SCORE_ELEMENTS];
-  int mampfer_inhalt[8][3][3];
-  int tempo_amoebe;
-  int dauer_sieb;
-  int dauer_ablenk;
-  int amoebe_inhalt;
-  boolean high_speed;
+  int yam_content[MAX_ELEMENT_CONTENTS][3][3];
+  int num_yam_contents;
+  int amoeba_speed;
+  int amoeba_content;
+  int time_magic_wall;
+  int time_wheel;
+  boolean double_speed;
+  boolean gravity;
 };
 
 struct LevelDirInfo
 {
-  char *filename;
-  char *name;
-  int levels;
-  int first_level;
-  int last_level;
-  int sort_priority;
-  boolean user_defined;
-  boolean readonly;
+  char *filename;	/* level series sub-directory inside level directory */
+  char *name;		/* level series name, as displayed on main screen */
+  char *name_short;	/* optional short name for level selection screen */
+  char *author;		/* level series author name levels without author */
+  char *imported_from;	/* optional comment for imported level series */
+  int levels;		/* number of levels in level series */
+  int first_level;	/* first level number (to allow start with 0 or 1) */
+  int last_level;	/* last level number (automatically calculated) */
+  int sort_priority;	/* sort levels by 'sort_priority' and then by name */
+  boolean user_defined;	/* user defined levels are stored in home directory */
+  boolean readonly;	/* readonly levels can not be changed with editor */
+  int color;		/* color to use on selection screen for this level */
+  char *class_desc;	/* description of level series class */
 };
 
 struct TapeInfo
@@ -377,6 +412,22 @@ struct TapeInfo
   } pos[MAX_TAPELEN];
 };
 
+struct GameInfo
+{
+  int emulation;
+  int yam_content_nr;
+  boolean magic_wall_active;
+  int magic_wall_time_left;
+  int belt_dir[4];
+  int belt_dir_nr[4];
+  int switchgate_pos;
+  int light_time_left;
+};
+
+struct GlobalInfo
+{
+};
+
 extern Display	       *display;
 extern Visual	       *visual;
 extern int		screen;
@@ -425,10 +476,11 @@ extern short		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
-extern unsigned long	Elementeigenschaften[MAX_ELEMENTS];
+extern unsigned long	Elementeigenschaften1[MAX_ELEMENTS];
+extern unsigned long	Elementeigenschaften2[MAX_ELEMENTS];
 
 extern int		level_nr, leveldir_nr, num_leveldirs;
 extern int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
@@ -438,19 +490,15 @@ extern int		ScreenMovDir, ScreenMovPos, ScreenGfxPos;
 extern int		BorderElement;
 extern int		GameFrameDelay;
 extern int		FfwdFrameDelay;
-extern int		MoveSpeed;
 extern int		BX1,BY1, BX2,BY2;
 extern int		SBX_Left, SBX_Right;
 extern int		SBY_Upper, SBY_Lower;
 extern int		ZX,ZY, ExitX,ExitY;
 extern int		AllPlayersGone;
 extern int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
-extern int		MampferMax, MampferNr;
 extern boolean		SiebAktiv;
 extern int		SiebCount;
 
-extern int		game_emulation;
-
 extern boolean		network_player_action_received;
 
 extern struct LevelDirInfo	leveldir[];
@@ -464,17 +512,20 @@ extern struct OptionInfo	options;
 extern struct SetupInfo		setup;
 extern struct SetupFileList	*setup_list;
 extern struct SetupFileList	*level_setup_list;
+extern struct GameInfo		game;
+extern struct GlobalInfo	global;
 
 extern char		*sound_name[];
 extern int		background_loop[];
 extern int		num_bg_loops;
+extern char		*element_info[];
 
 
 /* often used screen positions */
 #define SX			8
 #define SY			8
-#define REAL_SX			(SX-2)
-#define REAL_SY			(SY-2)
+#define REAL_SX			(SX - 2)
+#define REAL_SY			(SY - 2)
 #define DX			566
 #define DY			60
 #define VX			DX
@@ -483,29 +534,29 @@ extern int		num_bg_loops;
 #define EY			(VY - 44)
 #define TILEX			32
 #define TILEY			32
-#define MINI_TILEX		(TILEX/2)
-#define MINI_TILEY		(TILEY/2)
-#define MICRO_TILEX		(TILEX/8)
-#define MICRO_TILEY		(TILEY/8)
-#define MIDPOSX			(SCR_FIELDX/2)
-#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 MINI_TILEX		(TILEX / 2)
+#define MINI_TILEY		(TILEY / 2)
+#define MICRO_TILEX		(TILEX / 8)
+#define MICRO_TILEY		(TILEY / 8)
+#define MIDPOSX			(SCR_FIELDX / 2)
+#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 VYSIZE			100
 #define EXSIZE			DXSIZE
 #define EYSIZE			(VXSIZE + 44)
-#define FULL_SXSIZE		(2+SXSIZE+2)
-#define FULL_SYSIZE		(2+SYSIZE+2)
-#define MICROLEV_XPOS		(SX+4*32+16)
-#define MICROLEV_YPOS		(SX+12*32)
-#define MICROLEV_XSIZE		(STD_LEV_FIELDX*MICRO_TILEX)
-#define MICROLEV_YSIZE		(STD_LEV_FIELDY*MICRO_TILEY)
-#define MICROLABEL_YPOS		(MICROLEV_YPOS+MICROLEV_YSIZE+12)
+#define FULL_SXSIZE		(2 + SXSIZE + 2)
+#define FULL_SYSIZE		(2 + SYSIZE + 2)
+#define MICROLEV_XSIZE		((STD_LEV_FIELDX + 2) * MICRO_TILEX)
+#define MICROLEV_YSIZE		((STD_LEV_FIELDY + 2) * MICRO_TILEY)
+#define MICROLEV_XPOS		(SX + (SXSIZE - MICROLEV_XSIZE) / 2)
+#define MICROLEV_YPOS		(SX + 12 * TILEY - MICRO_TILEY)
+#define MICROLABEL_YPOS		(MICROLEV_YPOS + MICROLEV_YSIZE + 7)
 #define FONT1_XSIZE		32
 #define FONT1_YSIZE		32
 #define FONT2_XSIZE		14
@@ -514,6 +565,8 @@ extern int		num_bg_loops;
 #define FONT3_YSIZE		14
 #define FONT4_XSIZE		16
 #define FONT4_YSIZE		16
+#define FONT5_XSIZE		10
+#define FONT5_YSIZE		14
 
 #define GFX_STARTX		SX
 #define GFX_STARTY		SY
@@ -524,20 +577,31 @@ extern int		num_bg_loops;
 #define GFX_PER_LINE		16
 #define MINI_GFX_PER_LINE	32
 #define MICRO_GFX_PER_LINE	128
+
 #define HEROES_PER_LINE		16
-#define MINI_MORE_STARTX	0
-#define MINI_MORE_STARTY	160
-#define MICRO_MORE_STARTX	0
-#define MICRO_MORE_STARTY	240
-#define MORE_PER_LINE		16
-#define MINI_MORE_PER_LINE	16
-#define MICRO_MORE_PER_LINE	16
+
+#define MINI_SP_STARTX		0
+#define MINI_SP_STARTY		352
+#define MICRO_SP_STARTX		0
+#define MICRO_SP_STARTY		448
+#define SP_PER_LINE		16
+#define MINI_SP_PER_LINE	16
+#define MICRO_SP_PER_LINE	64
+
+#define MINI_DC_STARTX		256
+#define MINI_DC_STARTY		0
+#define MICRO_DC_STARTX		256
+#define MICRO_DC_STARTY		384
+#define DC_PER_LINE		8
+#define MINI_DC_PER_LINE	8
+#define MICRO_DC_PER_LINE	8
+
 #define FONT_CHARS_PER_LINE	16
 #define FONT_LINES_PER_FONT	4
 
 /* game elements:
-**	  0 - 255: real elements, stored in level file
-**	256 - 511: flag elements, only used at runtime
+**	  0 - 499: real elements, stored in level file
+**      500 - 699: flag elements, only used at runtime
 */
 /* "real" level elements */
 #define EL_LEERRAUM		0
@@ -568,7 +632,7 @@ extern int		num_bg_loops;
 #define EL_KOKOSNUSS		25
 #define EL_LIFE			26
 #define EL_LIFE_ASYNC		27
-#define EL_DYNAMIT		28
+#define EL_DYNAMITE_ACTIVE	28
 #define EL_BADEWANNE		29
 #define EL_ABLENK_AUS		30
 #define EL_ABLENK_EIN		31
@@ -584,7 +648,7 @@ extern int		num_bg_loops;
 #define EL_PFORTE2X		41
 #define EL_PFORTE3X		42
 #define EL_PFORTE4X		43
-#define EL_DYNAMIT_AUS		44
+#define EL_DYNAMITE_INACTIVE	44
 #define EL_PACMAN		45
 #define EL_UNSICHTBAR		46
 #define EL_BIRNE_AUS		47
@@ -602,10 +666,10 @@ extern int		num_bg_loops;
 #define EL_ERZ_EDEL_GELB	59
 #define EL_MAMPFER2		60
 #define EL_SIEB2_INAKTIV	61
+#define EL_INVISIBLE_STEEL	62
 
-#define EL_UNUSED_62		62
+#define EL_UNUSED_63		63
 
-#define EL_DYNABOMB		63
 #define EL_DYNABOMB_NR		64
 #define EL_DYNABOMB_SZ		65
 #define EL_DYNABOMB_XL		66
@@ -661,7 +725,7 @@ extern int		num_bg_loops;
 
 #define EL_AUSGANG_AUF		107
 
-#define EL_UNUSED_108		108
+#define EL_BLACK_ORB		108
 
 #define EL_AMOEBA2DIAM		109
 #define EL_MAULWURF		110
@@ -674,17 +738,20 @@ extern int		num_bg_loops;
 #define EL_SCHWEIN		117
 #define EL_DRACHE		118
 
-#define EL_UNUSED_119		119
+#define EL_EM_KEY_1_FILE	119
 
 #define EL_CHAR_START		120
 #define EL_CHAR_ASCII0		(EL_CHAR_START-32)
 #define EL_CHAR_AUSRUF		(EL_CHAR_ASCII0+33)
 #define EL_CHAR_ZOLL		(EL_CHAR_ASCII0+34)
+#define EL_CHAR_RAUTE		(EL_CHAR_ASCII0+35)
 #define EL_CHAR_DOLLAR		(EL_CHAR_ASCII0+36)
 #define EL_CHAR_PROZ		(EL_CHAR_ASCII0+37)
+#define EL_CHAR_AMPERSAND	(EL_CHAR_ASCII0+38)
 #define EL_CHAR_APOSTR		(EL_CHAR_ASCII0+39)
 #define EL_CHAR_KLAMM1		(EL_CHAR_ASCII0+40)
 #define EL_CHAR_KLAMM2		(EL_CHAR_ASCII0+41)
+#define EL_CHAR_MULT		(EL_CHAR_ASCII0+42)
 #define EL_CHAR_PLUS		(EL_CHAR_ASCII0+43)
 #define EL_CHAR_KOMMA		(EL_CHAR_ASCII0+44)
 #define EL_CHAR_MINUS		(EL_CHAR_ASCII0+45)
@@ -707,19 +774,23 @@ extern int		num_bg_loops;
 #define EL_CHAR_COPY		(EL_CHAR_ASCII0+94)
 #define EL_CHAR_END		(EL_CHAR_START+79)
 
-#define EL_CHAR(x)		(EL_CHAR_A + x - 'A')
+#define EL_CHAR(x)		((x) == 'Ä' ? EL_CHAR_AE : \
+				 (x) == 'Ö' ? EL_CHAR_OE : \
+				 (x) == 'Ü' ? EL_CHAR_UE : \
+				 EL_CHAR_A + (x) - 'A')
 
 #define EL_MAUER_X		200
 #define EL_MAUER_Y		201
 #define EL_MAUER_XY		202
 
-#define EL_UNUSED_203		203
-#define EL_UNUSED_204		204
-#define EL_UNUSED_205		205
-#define EL_UNUSED_206		206
-#define EL_UNUSED_207		207
-#define EL_UNUSED_208		208
-#define EL_UNUSED_209		209
+#define EL_EM_GATE_1		203
+#define EL_EM_GATE_2		204
+#define EL_EM_GATE_3		205
+#define EL_EM_GATE_4		206
+
+#define EL_EM_KEY_2_FILE	207
+#define EL_EM_KEY_3_FILE	208
+#define EL_EM_KEY_4_FILE	209
 
 #define EL_SP_START		210
 #define EL_SP_EMPTY		(EL_SP_START + 0)
@@ -764,52 +835,128 @@ extern int		num_bg_loops;
 #define EL_SP_CHIP_LOWER	(EL_SP_START + 39)
 #define EL_SP_END		(EL_SP_START + 39)
 
-#define EL_UNUSED_250		250
-#define EL_UNUSED_251		251
-#define EL_UNUSED_252		252
-#define EL_UNUSED_253		253
+#define EL_EM_GATE_1X		250
+#define EL_EM_GATE_2X		251
+#define EL_EM_GATE_3X		252
+#define EL_EM_GATE_4X		253
+
 #define EL_UNUSED_254		254
 #define EL_UNUSED_255		255
 
+#define EL_PEARL		256
+#define EL_CRYSTAL		257
+#define EL_WALL_PEARL		258
+#define EL_WALL_CRYSTAL		259
+#define EL_DOOR_WHITE		260
+#define EL_DOOR_WHITE_GRAY	261
+#define EL_KEY_WHITE		262
+#define EL_FORCE_FIELD		263
+#define EL_EXTRA_TIME		264
+#define EL_SWITCHGATE_OPEN	265
+#define EL_SWITCHGATE_CLOSED	266
+#define EL_SWITCHGATE_SWITCH_1	267
+#define EL_SWITCHGATE_SWITCH_2	268
+#define EL_TIME_GATE		269
+#define EL_TIME_GATE_WHEEL	270
+#define EL_BELT1_LEFT		271
+#define EL_BELT1_MIDDLE		272
+#define EL_BELT1_RIGHT		273
+#define EL_BELT1_SWITCH_L	274
+#define EL_BELT1_SWITCH_M	275
+#define EL_BELT1_SWITCH_R	276
+#define EL_BELT2_LEFT		277
+#define EL_BELT2_MIDDLE		278
+#define EL_BELT2_RIGHT		279
+#define EL_BELT2_SWITCH_L	280
+#define EL_BELT2_SWITCH_M	281
+#define EL_BELT2_SWITCH_R	282
+#define EL_BELT3_LEFT		283
+#define EL_BELT3_MIDDLE		284
+#define EL_BELT3_RIGHT		285
+#define EL_BELT3_SWITCH_L	286
+#define EL_BELT3_SWITCH_M	287
+#define EL_BELT3_SWITCH_R	288
+#define EL_BELT4_LEFT		289
+#define EL_BELT4_MIDDLE		290
+#define EL_BELT4_RIGHT		291
+#define EL_BELT4_SWITCH_L	292
+#define EL_BELT4_SWITCH_M	293
+#define EL_BELT4_SWITCH_R	294
+#define EL_LANDMINE		295
+#define EL_ENVELOPE		296
+#define EL_LIGHT_SWITCH_OFF	297
+#define EL_LIGHT_SWITCH_ON	298
+#define EL_SIGN_EXCLAMATION	299
+#define EL_SIGN_RADIOACTIVITY	300
+#define EL_SIGN_STOP		301
+#define EL_SIGN_WHEELCHAIR	302
+#define EL_SIGN_PARKING		303
+#define EL_SIGN_ONEWAY		304
+#define EL_SIGN_HEART		305
+#define EL_SIGN_TRIANGLE	306
+#define EL_SIGN_ROUND		307
+#define EL_SIGN_EXIT		308
+#define EL_SIGN_YINYANG		309
+#define EL_SIGN_OTHER		310
+#define EL_MOLE_LEFT		311
+#define EL_MOLE_RIGHT		312
+#define EL_MOLE_UP		313
+#define EL_MOLE_DOWN		314
+#define EL_STEEL_SLANTED	315
+#define EL_SAND_INVISIBLE	316
+
 /* "real" (and therefore drawable) runtime elements */
-#define EL_SIEB_LEER		300
-#define EL_SIEB2_LEER		301
-#define EL_SIEB_VOLL		302
-#define EL_SIEB2_VOLL		303
-#define EL_SIEB_TOT		304
-#define EL_SIEB2_TOT		305
-#define EL_AUSGANG_ACT		306
-#define EL_SP_TERMINAL_ACTIVE	307
-#define EL_SP_BUG_ACTIVE	308
+#define EL_SIEB_LEER		500
+#define EL_SIEB2_LEER		501
+#define EL_SIEB_VOLL		502
+#define EL_SIEB2_VOLL		503
+#define EL_SIEB_TOT		504
+#define EL_SIEB2_TOT		505
+#define EL_AUSGANG_ACT		506
+#define EL_SP_TERMINAL_ACTIVE	507
+#define EL_SP_BUG_ACTIVE	508
+#define EL_EM_KEY_1		509
+#define EL_EM_KEY_2		510
+#define EL_EM_KEY_3		511
+#define EL_EM_KEY_4		512
+#define EL_DYNABOMB_ACTIVE_1	513
+#define EL_DYNABOMB_ACTIVE_2	514
+#define EL_DYNABOMB_ACTIVE_3	515
+#define EL_DYNABOMB_ACTIVE_4	516
+#define EL_SWITCHGATE_OPENING	517
+#define EL_SWITCHGATE_CLOSING	518
 
 /* "unreal" (and therefore not drawable) runtime elements */
-#define EL_BLOCKED		400
-#define EL_EXPLODING		401
-#define EL_CRACKINGNUT		402
-#define EL_BLURB_LEFT		403
-#define EL_BLURB_RIGHT		404
-#define EL_AMOEBING		405
-#define EL_MAUERND		406
-#define EL_BURNING		407
-#define EL_PLAYER_IS_LEAVING	408
+#define EL_BLOCKED		600
+#define EL_EXPLODING		601
+#define EL_CRACKINGNUT		602
+#define EL_BLURB_LEFT		603
+#define EL_BLURB_RIGHT		604
+#define EL_AMOEBING		605
+#define EL_MAUERND		606
+#define EL_BURNING		607
+#define EL_PLAYER_IS_LEAVING	608
 
 /* game graphics:
 **	  0 -  255: graphics from "RocksScreen"
 **	256 -  511: graphics from "RocksFont"
-**	512 -  767: graphics from "RocksMore"
-**	768 - 1023: graphics from "RocksHeroes"
+**	512 -  767: graphics from "RocksHeroes"
+**	768 - 1023: graphics from "RocksSP"
+**     1024 - 1279: graphics from "RocksDC"
 */
 
 #define GFX_START_ROCKSSCREEN	0
 #define GFX_END_ROCKSSCREEN	255
 #define GFX_START_ROCKSFONT	256
 #define GFX_END_ROCKSFONT	511
-#define GFX_START_ROCKSMORE	512
-#define GFX_END_ROCKSMORE	767
-#define GFX_START_ROCKSHEROES	768
-#define GFX_END_ROCKSHEROES	1023
+#define GFX_START_ROCKSHEROES	512
+#define GFX_END_ROCKSHEROES	767
+#define GFX_START_ROCKSSP	768
+#define GFX_END_ROCKSSP		1023
+#define GFX_START_ROCKSDC	1024
+#define GFX_END_ROCKSDC		1279
 
-#define NUM_TILES		1024
+#define NUM_TILES		1280
 
 /* graphics from "RocksScreen" */
 /* Zeile 0 (0) */
@@ -828,7 +975,11 @@ extern int		num_bg_loops;
 #define GFX_BADEWANNE1		16
 #define GFX_SALZSAEURE		17
 #define GFX_BADEWANNE2		18
+
+/*
 #define GFX_UNSICHTBAR		19
+*/
+
 #define GFX_SCHLUESSEL1		20
 #define GFX_SCHLUESSEL2		21
 #define GFX_SCHLUESSEL3		22
@@ -928,6 +1079,7 @@ extern int		num_bg_loops;
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
+#define GFX_BLACK_ORB		157
 #define GFX_SPEED_PILL		158
 #define GFX_SONDE		159
 /* Zeile 10 (160) */
@@ -967,6 +1119,21 @@ extern int		num_bg_loops;
 #define GFX_FIREFLY_L		206
 #define GFX_FIREFLY_U		207
 
+/* only available as size MINI_TILE */
+#define GFX_VSTEEL_UPPER_LEFT	208
+#define GFX_VSTEEL_UPPER_RIGHT	209
+#define GFX_VSTEEL_LOWER_LEFT	210
+#define GFX_VSTEEL_LOWER_RIGHT	211
+#define GFX_VSTEEL_HORIZONTAL	212
+#define GFX_VSTEEL_VERTICAL	213
+#define GFX_ISTEEL_UPPER_LEFT	214
+#define GFX_ISTEEL_UPPER_RIGHT	215
+#define GFX_ISTEEL_LOWER_LEFT	216
+#define GFX_ISTEEL_LOWER_RIGHT	217
+#define GFX_ISTEEL_HORIZONTAL	218
+#define GFX_ISTEEL_VERTICAL	219
+
+/* elements with graphics borrowed from other elements */
 #define GFX_SCHLUESSEL		GFX_SCHLUESSEL1
 #define GFX_SPIELFIGUR		GFX_SPIELER1
 
@@ -1024,92 +1191,193 @@ extern int		num_bg_loops;
 #define GFX_FLAMMEN_UP		(GFX_START_ROCKSHEROES +14*HEROES_PER_LINE + 8)
 #define GFX_FLAMMEN_DOWN	(GFX_START_ROCKSHEROES +15*HEROES_PER_LINE + 8)
 
-/* graphics from "RocksMore" */
-#define GFX_SP_EMPTY		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 0)
-#define GFX_SP_ZONK		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 1)
-#define GFX_SP_BASE		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 2)
-#define GFX_SP_MURPHY		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 3)
-#define GFX_SP_INFOTRON		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 4)
-#define GFX_SP_CHIP_SINGLE	(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 5)
-#define GFX_SP_HARD_GRAY	(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 6)
-#define GFX_SP_EXIT		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE + 7)
-#define GFX_SP_DISK_ORANGE	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 0)
-#define GFX_SP_PORT1_RIGHT	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 1)
-#define GFX_SP_PORT1_DOWN	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 2)
-#define GFX_SP_PORT1_LEFT	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 3)
-#define GFX_SP_PORT1_UP		(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 4)
-#define GFX_SP_PORT2_RIGHT	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 5)
-#define GFX_SP_PORT2_DOWN	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 6)
-#define GFX_SP_PORT2_LEFT	(GFX_START_ROCKSMORE +  1 * MORE_PER_LINE + 7)
-#define GFX_SP_PORT2_UP		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 0)
-#define GFX_SP_SNIKSNAK		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 1)
-#define GFX_SP_DISK_YELLOW	(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 2)
-#define GFX_SP_TERMINAL		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 3)
-#define GFX_SP_DISK_RED		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 4)
-#define GFX_SP_PORT_Y		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 5)
-#define GFX_SP_PORT_X		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 6)
-#define GFX_SP_PORT_XY		(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE + 7)
-#define GFX_SP_ELECTRON		(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 0)
-#define GFX_SP_BUG		(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 1)
-#define GFX_SP_CHIP_LEFT	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 2)
-#define GFX_SP_CHIP_RIGHT	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 3)
-#define GFX_SP_HARD_BASE1	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 4)
-#define GFX_SP_HARD_GREEN	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 5)
-#define GFX_SP_HARD_BLUE	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 6)
-#define GFX_SP_HARD_RED		(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 7)
-#define GFX_SP_HARD_YELLOW	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 0)
-#define GFX_SP_HARD_BASE2	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 1)
-#define GFX_SP_HARD_BASE3	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 2)
-#define GFX_SP_HARD_BASE4	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 3)
-#define GFX_SP_HARD_BASE5	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 4)
-#define GFX_SP_HARD_BASE6	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 5)
-#define GFX_SP_CHIP_UPPER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 6)
-#define GFX_SP_CHIP_LOWER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 7)
-
-#define GFX_SP_BUG_WARNING	(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE +15)
-#define GFX_SP_EXPLODE_EMPTY	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 8)
-#define GFX_SP_EXPLODE_INFOTRON	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 8)
-#define GFX_SP_BUG_ACTIVE	(GFX_START_ROCKSMORE +  6 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_LEFT	(GFX_START_ROCKSMORE +  8 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_RIGHT	(GFX_START_ROCKSMORE +  8 * MORE_PER_LINE +12)
-#define GFX_SP_SNIKSNAK_UP	(GFX_START_ROCKSMORE +  9 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_DOWN	(GFX_START_ROCKSMORE +  9 * MORE_PER_LINE +12)
-
-#define GFX2_SP_ELECTRON	(GFX_START_ROCKSMORE + 10 * MORE_PER_LINE + 8)
-#define GFX2_SP_TERMINAL	(GFX_START_ROCKSMORE + 11 * MORE_PER_LINE + 8)
-#define GFX2_SP_TERMINAL_ACTIVE	(GFX_START_ROCKSMORE + 12 * MORE_PER_LINE + 8)
+/* graphics from "RocksSP" */
+#define GFX_SP_EMPTY		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  0)
+/*
+#define GFX_SP_ZONK		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  1)
+*/
+#define GFX_SP_BASE		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  2)
+#define GFX_SP_MURPHY		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  3)
+#define GFX_SP_INFOTRON		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  4)
+#define GFX_SP_CHIP_SINGLE	(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  5)
+#define GFX_SP_HARD_GRAY	(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  6)
+#define GFX_SP_EXIT		(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  7)
+#define GFX_SP_DISK_ORANGE	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  0)
+#define GFX_SP_PORT1_RIGHT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  1)
+#define GFX_SP_PORT1_DOWN	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  2)
+#define GFX_SP_PORT1_LEFT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  3)
+#define GFX_SP_PORT1_UP		(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  4)
+#define GFX_SP_PORT2_RIGHT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  5)
+#define GFX_SP_PORT2_DOWN	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  6)
+#define GFX_SP_PORT2_LEFT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  7)
+#define GFX_SP_PORT2_UP		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  0)
+#define GFX_SP_SNIKSNAK		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  1)
+#define GFX_SP_DISK_YELLOW	(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  2)
+#define GFX_SP_TERMINAL		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  3)
+#define GFX_SP_DISK_RED		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  4)
+#define GFX_SP_PORT_Y		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  5)
+#define GFX_SP_PORT_X		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  6)
+#define GFX_SP_PORT_XY		(GFX_START_ROCKSSP +  2 * SP_PER_LINE +  7)
+#define GFX_SP_ELECTRON		(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  0)
+#define GFX_SP_BUG		(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  1)
+#define GFX_SP_CHIP_LEFT	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  2)
+#define GFX_SP_CHIP_RIGHT	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  3)
+#define GFX_SP_HARD_BASE1	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  4)
+#define GFX_SP_HARD_GREEN	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  5)
+#define GFX_SP_HARD_BLUE	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  6)
+#define GFX_SP_HARD_RED		(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  7)
+#define GFX_SP_HARD_YELLOW	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  0)
+#define GFX_SP_HARD_BASE2	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  1)
+#define GFX_SP_HARD_BASE3	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  2)
+#define GFX_SP_HARD_BASE4	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  3)
+#define GFX_SP_HARD_BASE5	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  4)
+#define GFX_SP_HARD_BASE6	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  5)
+#define GFX_SP_CHIP_UPPER	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  6)
+#define GFX_SP_CHIP_LOWER	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  7)
+
+#define GFX_INVISIBLE_STEEL_ON	(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  1)
+#define GFX_SAND_INVISIBLE_ON	(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  2)
+#define GFX_INVISIBLE_STEEL	(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  3)
+#define GFX_UNSICHTBAR_ON	(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  5)
+#define GFX_SAND_INVISIBLE	(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  6)
+#define GFX_UNSICHTBAR		(GFX_START_ROCKSSP +  5 * SP_PER_LINE +  7)
+
+#define GFX_SP_ZONK		(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  0)
+
+#define GFX_EM_KEY_1		(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  4)
+#define GFX_EM_KEY_2		(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  5)
+#define GFX_EM_KEY_3		(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  6)
+#define GFX_EM_KEY_4		(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  7)
+#define GFX_EM_GATE_1		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  0)
+#define GFX_EM_GATE_2		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  1)
+#define GFX_EM_GATE_3		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  2)
+#define GFX_EM_GATE_4		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  3)
+#define GFX_EM_GATE_1X		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  4)
+#define GFX_EM_GATE_2X		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  5)
+#define GFX_EM_GATE_3X		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  6)
+#define GFX_EM_GATE_4X		(GFX_START_ROCKSSP +  7 * SP_PER_LINE +  7)
+
+#define GFX_MURPHY_GO_LEFT	(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  8)
+#define GFX_MURPHY_ANY_LEFT	(GFX_START_ROCKSSP +  0 * SP_PER_LINE +  9)
+#define GFX_MURPHY_GO_RIGHT	(GFX_START_ROCKSSP +  0 * SP_PER_LINE + 11)
+#define GFX_MURPHY_ANY_RIGHT	(GFX_START_ROCKSSP +  0 * SP_PER_LINE + 12)
+#define GFX_MURPHY_SNAP_UP	(GFX_START_ROCKSSP +  0 * SP_PER_LINE + 14)
+#define GFX_MURPHY_SNAP_DOWN	(GFX_START_ROCKSSP +  0 * SP_PER_LINE + 15)
+#define GFX_MURPHY_SNAP_RIGHT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  8)
+#define GFX_MURPHY_SNAP_LEFT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE +  9)
+#define GFX_MURPHY_PUSH_RIGHT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE + 10)
+#define GFX_MURPHY_PUSH_LEFT	(GFX_START_ROCKSSP +  1 * SP_PER_LINE + 11)
+
+#define GFX_SP_BUG_WARNING	(GFX_START_ROCKSSP +  2 * SP_PER_LINE + 15)
+#define GFX_SP_EXPLODE_EMPTY	(GFX_START_ROCKSSP +  3 * SP_PER_LINE +  8)
+#define GFX_SP_EXPLODE_INFOTRON	(GFX_START_ROCKSSP +  4 * SP_PER_LINE +  8)
+#define GFX_SP_BUG_ACTIVE	(GFX_START_ROCKSSP +  6 * SP_PER_LINE +  8)
+#define GFX_SP_SNIKSNAK_LEFT	(GFX_START_ROCKSSP +  8 * SP_PER_LINE +  8)
+#define GFX_SP_SNIKSNAK_RIGHT	(GFX_START_ROCKSSP +  8 * SP_PER_LINE + 12)
+#define GFX_SP_SNIKSNAK_UP	(GFX_START_ROCKSSP +  9 * SP_PER_LINE +  8)
+#define GFX_SP_SNIKSNAK_DOWN	(GFX_START_ROCKSSP +  9 * SP_PER_LINE + 12)
+
+#define GFX2_SP_ELECTRON	(GFX_START_ROCKSSP + 10 * SP_PER_LINE +  8)
+#define GFX2_SP_TERMINAL	(GFX_START_ROCKSSP + 11 * SP_PER_LINE +  8)
+#define GFX2_SP_TERMINAL_ACTIVE	(GFX_START_ROCKSSP + 12 * SP_PER_LINE +  8)
+
+/* graphics from "RocksDC" */
+#define GFX_BELT1_MIDDLE	(GFX_START_ROCKSDC +  0 * DC_PER_LINE +  0)
+#define GFX_BELT1_LEFT		(GFX_START_ROCKSDC +  1 * DC_PER_LINE +  0)
+#define GFX_BELT1_RIGHT		(GFX_START_ROCKSDC +  2 * DC_PER_LINE +  0)
+#define GFX_BELT2_MIDDLE	(GFX_START_ROCKSDC +  3 * DC_PER_LINE +  0)
+#define GFX_BELT2_LEFT		(GFX_START_ROCKSDC +  4 * DC_PER_LINE +  0)
+#define GFX_BELT2_RIGHT		(GFX_START_ROCKSDC +  5 * DC_PER_LINE +  0)
+#define GFX_BELT3_MIDDLE	(GFX_START_ROCKSDC +  6 * DC_PER_LINE +  0)
+#define GFX_BELT3_LEFT		(GFX_START_ROCKSDC +  7 * DC_PER_LINE +  0)
+#define GFX_BELT3_RIGHT		(GFX_START_ROCKSDC +  8 * DC_PER_LINE +  0)
+#define GFX_BELT4_MIDDLE	(GFX_START_ROCKSDC +  9 * DC_PER_LINE +  0)
+#define GFX_BELT4_LEFT		(GFX_START_ROCKSDC + 10 * DC_PER_LINE +  0)
+#define GFX_BELT4_RIGHT		(GFX_START_ROCKSDC + 11 * DC_PER_LINE +  0)
+#define GFX_BELT1_SWITCH_L	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  0)
+#define GFX_BELT2_SWITCH_L	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  1)
+#define GFX_BELT3_SWITCH_L	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  2)
+#define GFX_BELT4_SWITCH_L	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  3)
+#define GFX_BELT1_SWITCH_M	(GFX_START_ROCKSDC + 13 * DC_PER_LINE +  0)
+#define GFX_BELT2_SWITCH_M	(GFX_START_ROCKSDC + 13 * DC_PER_LINE +  1)
+#define GFX_BELT3_SWITCH_M	(GFX_START_ROCKSDC + 13 * DC_PER_LINE +  2)
+#define GFX_BELT4_SWITCH_M	(GFX_START_ROCKSDC + 13 * DC_PER_LINE +  3)
+#define GFX_BELT1_SWITCH_R	(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  0)
+#define GFX_BELT2_SWITCH_R	(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  1)
+#define GFX_BELT3_SWITCH_R	(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  2)
+#define GFX_BELT4_SWITCH_R	(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  3)
+
+#define GFX_SWITCHGATE_OPEN	(GFX_START_ROCKSDC + 15 * DC_PER_LINE +  4)
+#define GFX_SWITCHGATE_CLOSED	(GFX_START_ROCKSDC + 15 * DC_PER_LINE +  0)
+#define GFX_SWITCHGATE_SWITCH_1	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  4)
+#define GFX_SWITCHGATE_SWITCH_2	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  5)
+#define GFX_LIGHT_SWITCH_OFF	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  6)
+#define GFX_LIGHT_SWITCH_ON	(GFX_START_ROCKSDC + 12 * DC_PER_LINE +  7)
+
+#define GFX_ENVELOPE		(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  4)
+#define GFX_SIGN_EXCLAMATION	(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  5)
+#define GFX_SIGN_STOP		(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  6)
+#define GFX_LANDMINE		(GFX_START_ROCKSDC + 14 * DC_PER_LINE +  7)
+#define GFX_STEEL_SLANTED	(GFX_START_ROCKSDC + 15 * DC_PER_LINE +  5)
 
 /* graphics from "RocksFont" */
 #define GFX_CHAR_START		(GFX_START_ROCKSFONT)
-#define GFX_CHAR_ASCII0		(GFX_CHAR_START-32)
-#define GFX_CHAR_AUSRUF		(GFX_CHAR_ASCII0+33)
-#define GFX_CHAR_ZOLL		(GFX_CHAR_ASCII0+34)
-#define GFX_CHAR_DOLLAR		(GFX_CHAR_ASCII0+36)
-#define GFX_CHAR_PROZ		(GFX_CHAR_ASCII0+37)
-#define GFX_CHAR_APOSTR		(GFX_CHAR_ASCII0+39)
-#define GFX_CHAR_KLAMM1		(GFX_CHAR_ASCII0+40)
-#define GFX_CHAR_KLAMM2		(GFX_CHAR_ASCII0+41)
-#define GFX_CHAR_PLUS		(GFX_CHAR_ASCII0+43)
-#define GFX_CHAR_KOMMA		(GFX_CHAR_ASCII0+44)
-#define GFX_CHAR_MINUS		(GFX_CHAR_ASCII0+45)
-#define GFX_CHAR_PUNKT		(GFX_CHAR_ASCII0+46)
-#define GFX_CHAR_SLASH		(GFX_CHAR_ASCII0+47)
-#define GFX_CHAR_0		(GFX_CHAR_ASCII0+48)
-#define GFX_CHAR_9		(GFX_CHAR_ASCII0+57)
-#define GFX_CHAR_DOPPEL		(GFX_CHAR_ASCII0+58)
-#define GFX_CHAR_SEMIKL		(GFX_CHAR_ASCII0+59)
-#define GFX_CHAR_LT		(GFX_CHAR_ASCII0+60)
-#define GFX_CHAR_GLEICH		(GFX_CHAR_ASCII0+61)
-#define GFX_CHAR_GT		(GFX_CHAR_ASCII0+62)
-#define GFX_CHAR_FRAGE		(GFX_CHAR_ASCII0+63)
-#define GFX_CHAR_AT		(GFX_CHAR_ASCII0+64)
-#define GFX_CHAR_A		(GFX_CHAR_ASCII0+65)
-#define GFX_CHAR_Z		(GFX_CHAR_ASCII0+90)
-#define GFX_CHAR_AE		(GFX_CHAR_ASCII0+91)
-#define GFX_CHAR_OE		(GFX_CHAR_ASCII0+92)
-#define GFX_CHAR_UE		(GFX_CHAR_ASCII0+93)
-#define GFX_CHAR_COPY		(GFX_CHAR_ASCII0+94)
-#define GFX_CHAR_END		(GFX_CHAR_START+79)
+#define GFX_CHAR_ASCII0		(GFX_CHAR_START - 32)
+#define GFX_CHAR_AUSRUF		(GFX_CHAR_ASCII0 + 33)
+#define GFX_CHAR_ZOLL		(GFX_CHAR_ASCII0 + 34)
+#define GFX_CHAR_DOLLAR		(GFX_CHAR_ASCII0 + 36)
+#define GFX_CHAR_PROZ		(GFX_CHAR_ASCII0 + 37)
+#define GFX_CHAR_APOSTR		(GFX_CHAR_ASCII0 + 39)
+#define GFX_CHAR_KLAMM1		(GFX_CHAR_ASCII0 + 40)
+#define GFX_CHAR_KLAMM2		(GFX_CHAR_ASCII0 + 41)
+#define GFX_CHAR_PLUS		(GFX_CHAR_ASCII0 + 43)
+#define GFX_CHAR_KOMMA		(GFX_CHAR_ASCII0 + 44)
+#define GFX_CHAR_MINUS		(GFX_CHAR_ASCII0 + 45)
+#define GFX_CHAR_PUNKT		(GFX_CHAR_ASCII0 + 46)
+#define GFX_CHAR_SLASH		(GFX_CHAR_ASCII0 + 47)
+#define GFX_CHAR_0		(GFX_CHAR_ASCII0 + 48)
+#define GFX_CHAR_9		(GFX_CHAR_ASCII0 + 57)
+#define GFX_CHAR_DOPPEL		(GFX_CHAR_ASCII0 + 58)
+#define GFX_CHAR_SEMIKL		(GFX_CHAR_ASCII0 + 59)
+#define GFX_CHAR_LT		(GFX_CHAR_ASCII0 + 60)
+#define GFX_CHAR_GLEICH		(GFX_CHAR_ASCII0 + 61)
+#define GFX_CHAR_GT		(GFX_CHAR_ASCII0 + 62)
+#define GFX_CHAR_FRAGE		(GFX_CHAR_ASCII0 + 63)
+#define GFX_CHAR_AT		(GFX_CHAR_ASCII0 + 64)
+#define GFX_CHAR_A		(GFX_CHAR_ASCII0 + 65)
+#define GFX_CHAR_Z		(GFX_CHAR_ASCII0 + 90)
+#define GFX_CHAR_AE		(GFX_CHAR_ASCII0 + 91)
+#define GFX_CHAR_OE		(GFX_CHAR_ASCII0 + 92)
+#define GFX_CHAR_UE		(GFX_CHAR_ASCII0 + 93)
+#define GFX_CHAR_COPY		(GFX_CHAR_ASCII0 + 94)
+#define GFX_CHAR_END		(GFX_CHAR_START + 79)
+
+/* new elements which still have no graphic */
+#define GFX_PEARL		GFX_CHAR_FRAGE
+#define GFX_CRYSTAL		GFX_CHAR_FRAGE
+#define GFX_WALL_PEARL		GFX_CHAR_FRAGE
+#define GFX_WALL_CRYSTAL	GFX_CHAR_FRAGE
+#define GFX_DOOR_WHITE		GFX_CHAR_FRAGE
+#define GFX_DOOR_WHITE_GRAY	GFX_CHAR_FRAGE
+#define GFX_KEY_WHITE		GFX_CHAR_FRAGE
+#define GFX_FORCE_FIELD		GFX_CHAR_FRAGE
+#define GFX_EXTRA_TIME		GFX_CHAR_FRAGE
+#define GFX_TIME_GATE		GFX_CHAR_FRAGE
+#define GFX_TIME_GATE_WHEEL	GFX_CHAR_FRAGE
+#define GFX_SIGN_RADIOACTIVITY	GFX_CHAR_FRAGE
+#define GFX_SIGN_WHEELCHAIR	GFX_CHAR_FRAGE
+#define GFX_SIGN_PARKING	GFX_CHAR_FRAGE
+#define GFX_SIGN_ONEWAY		GFX_CHAR_FRAGE
+#define GFX_SIGN_HEART		GFX_CHAR_FRAGE
+#define GFX_SIGN_TRIANGLE	GFX_CHAR_FRAGE
+#define GFX_SIGN_ROUND		GFX_CHAR_FRAGE
+#define GFX_SIGN_EXIT		GFX_CHAR_FRAGE
+#define GFX_SIGN_YINYANG	GFX_CHAR_FRAGE
+#define GFX_SIGN_OTHER		GFX_CHAR_FRAGE
+#define GFX_MOLE_LEFT		GFX_CHAR_FRAGE
+#define GFX_MOLE_RIGHT		GFX_CHAR_FRAGE
+#define GFX_MOLE_UP		GFX_CHAR_FRAGE
+#define GFX_MOLE_DOWN		GFX_CHAR_FRAGE
 
 /* the names of the sounds */
 #define SND_ALCHEMY		0
@@ -1173,8 +1441,9 @@ extern int		num_bg_loops;
 #define SND_SP_BOOOM		58
 #define SND_SP_EXIT		59
 #define SND_EMPTY		60
+#define SND_GATE		61
 
-#define NUM_SOUNDS		61
+#define NUM_SOUNDS		62
 
 /* default input keys */
 #define KEY_UNDEFINDED		XK_VoidSymbol
@@ -1204,6 +1473,7 @@ extern int		num_bg_loops;
 #define FC_YELLOW		3
 #define FC_SPECIAL1		4
 #define FC_SPECIAL2		5
+#define FC_SPECIAL3		6
 
 /* values for game_status */
 #define EXITGAME		0
@@ -1218,11 +1488,16 @@ extern int		num_bg_loops;
 #define SETUPINPUT		9
 #define CALIBRATION		10
 
-#ifndef GAME_DIR
-#define GAME_DIR		"."
+#ifndef RO_GAME_DIR
+#define RO_GAME_DIR		"."
+#endif
+
+#ifndef RW_GAME_DIR
+#define RW_GAME_DIR		"."
 #endif
 
-#define BASE_PATH		GAME_DIR
+#define RO_BASE_PATH		RO_GAME_DIR
+#define RW_BASE_PATH		RW_GAME_DIR
 
 #define GRAPHICS_DIRECTORY	"graphics"
 #define SOUNDS_DIRECTORY	"sounds"
@@ -1230,14 +1505,21 @@ extern int		num_bg_loops;
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
 
-#define VERSION_STRING		"1.2.1"
-#define GAMETITLE_STRING	"Rocks'n'Diamonds"
-#define WINDOWTITLE_STRING	GAMETITLE_STRING " " VERSION_STRING
-#define COPYRIGHT_STRING	"Copyright ^1995-99 by Holger Schemel"
+#define PROGRAM_VERSION_STRING	"1.3.5"
+#define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
+#define PROGRAM_AUTHOR_STRING	"Holger Schemel"
+#define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING
+#define COPYRIGHT_STRING	"Copyright ^1995-99 by " PROGRAM_AUTHOR_STRING
 
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"
 
+/* default name for unknown player names */
+#define ANONYMOUS_NAME		"anonymous"
+
+/* default name for new levels */
+#define NAMELESS_LEVEL_NAME	"nameless level"
+
 /* values for button_status */
 #define MB_NOT_PRESSED		FALSE
 #define MB_RELEASED		FALSE
@@ -1246,29 +1528,30 @@ extern int		num_bg_loops;
 #define MB_MENU_MARK		TRUE
 #define MB_MENU_INITIALIZE	(-1)
 #define MB_LEFT			1
-#ifdef MSDOS
-#define MB_MIDDLE		4
-#define MB_RIGHT		2
-#else
 #define MB_MIDDLE		2
 #define MB_RIGHT		3
-#endif
 
 /* values for redraw_mask */
-#define REDRAW_ALL		(1L << 0)
-#define REDRAW_FIELD		(1L << 1)
-#define REDRAW_TILES		(1L << 2)
-#define REDRAW_DOOR_1		(1L << 3)
-#define REDRAW_VIDEO_1		(1L << 4)
-#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_DOOR_3		(1L << 9)
-#define REDRAW_DOORS	(REDRAW_DOOR_1 | REDRAW_DOOR_2 | REDRAW_DOOR_3)
-#define REDRAW_MAIN	(REDRAW_FIELD | REDRAW_TILES | REDRAW_MICROLEV)
-#define REDRAWTILES_THRESHOLD	SCR_FIELDX*SCR_FIELDY/2
+#define REDRAW_ALL		(1 << 0)
+#define REDRAW_FIELD		(1 << 1)
+#define REDRAW_TILES		(1 << 2)
+#define REDRAW_DOOR_1		(1 << 3)
+#define REDRAW_VIDEO_1		(1 << 4)
+#define REDRAW_VIDEO_2		(1 << 5)
+#define REDRAW_VIDEO_3		(1 << 6)
+#define REDRAW_MICROLEVEL	(1 << 7)
+#define REDRAW_FROM_BACKBUFFER	(1 << 8)
+#define REDRAW_DOOR_2		(REDRAW_VIDEO_1 | \
+				 REDRAW_VIDEO_2 | \
+				 REDRAW_VIDEO_3)
+#define REDRAW_DOOR_3		(1 << 9)
+#define REDRAW_DOORS		(REDRAW_DOOR_1 | \
+				 REDRAW_DOOR_2 | \
+				 REDRAW_DOOR_3)
+#define REDRAW_MAIN		(REDRAW_FIELD | \
+				 REDRAW_TILES | \
+				 REDRAW_MICROLEVEL)
+#define REDRAWTILES_THRESHOLD	(SCR_FIELDX * SCR_FIELDY / 2)
 
 /* areas in pixmap PIX_DOOR */
 /* meaning in PIX_DB_DOOR: (3 PAGEs)
@@ -1290,9 +1573,9 @@ extern int		num_bg_loops;
 #define DOOR_GFX_PAGEY2		DYSIZE
 
 /* for DrawGraphicAnimation() [tools.c] and AnimateToon() [cartoons.c] */
-#define ANIM_NORMAL	0
-#define ANIM_OSCILLATE	1
-#define ANIM_REVERSE	2
+#define ANIM_NORMAL		0
+#define ANIM_OSCILLATE		1
+#define ANIM_REVERSE		2
 
 /* values for game_emulation */
 #define EMU_NONE		0