X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=11588dd9aa019b29121e5ce994d18e368713dff3;hb=667288cc3f60989bfc84ac50bb69dae0c7bb5b22;hp=54efac83aa175866bed1e1db2b7ea93f0da1f1b5;hpb=cfe0b06c84dc509e45c616c21ca1d5ef71f2304f;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 54efac83..11588dd9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  main.h                                                  *
 ***********************************************************/
@@ -15,6 +14,13 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
 #ifndef MSDOS
 #define XK_MISCELLANY
 #define XK_LATIN1
@@ -27,24 +33,23 @@
 #include <X11/keysymdef.h>
 
 #ifdef   XPM_INCLUDE_FILE
+#define  USE_XPM_LIBRARY
 #include XPM_INCLUDE_FILE
 #endif
-#else
+#else	/* MSDOS */
 #include "msdos.h"
-#endif  /* #ifndef MSDOS */
+#endif  /* MSDOS */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#ifdef DEBUG
+#define DEBUG_TIMING	0
+#endif
 
-typedef int BOOL;
+typedef unsigned char boolean;
+typedef unsigned char byte;
 
 #ifndef FALSE
-#define FALSE 0
-#define TRUE (!FALSE)
+#define FALSE		0
+#define TRUE		(!FALSE)
 #endif
 
 #define WIN_XSIZE	672
@@ -52,10 +57,10 @@ typedef int BOOL;
 #ifndef MSDOS
 #define WIN_XPOS	0
 #define WIN_YPOS	0
-#else
+#else	/* MSDOS */
 #define WIN_XPOS	((XRES - WIN_XSIZE) / 2)
 #define WIN_YPOS	((YRES - WIN_YSIZE) / 2)
-#endif
+#endif	/* MSDOS */
 #define SCR_FIELDX	17
 #define SCR_FIELDY	17
 #define MAX_BUF_XSIZE	(SCR_FIELDX + 2)
@@ -82,6 +87,7 @@ typedef int BOOL;
 #ifndef SIGN
 #define SIGN(a)		((a) < 0 ? -1 : ((a)>0 ? 1 : 0))
 #endif
+
 #define SCREENX(a)	((a) - scroll_x)
 #define SCREENY(a)	((a) - scroll_y)
 #define LEVELX(a)	((a) + scroll_x)
@@ -90,32 +96,34 @@ typedef int BOOL;
 #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 EP_BIT_AMOEBALIVE	(1<<0)
-#define EP_BIT_AMOEBOID		(1<<1)
-#define EP_BIT_SCHLUESSEL	(1<<2)
-#define EP_BIT_PFORTE		(1<<3)
-#define EP_BIT_SOLID		(1<<4)
-#define EP_BIT_MASSIV		(1<<5)
-#define EP_BIT_SLIPPERY		(1<<6)
-#define EP_BIT_ENEMY		(1<<7)
-#define EP_BIT_MAUER		(1<<8)
-#define EP_BIT_CAN_FALL		(1<<9)
-#define EP_BIT_CAN_SMASH	(1<<10)
-#define EP_BIT_CAN_CHANGE	(1<<11)
-#define EP_BIT_CAN_MOVE		(1<<12)
-#define EP_BIT_COULD_MOVE	(1<<13)
-#define EP_BIT_DONT_TOUCH	(1<<14)
-#define EP_BIT_DONT_GO_TO	(1<<15)
-#define EP_BIT_MAMPF2		(1<<16)
-#define EP_BIT_CHAR		(1<<17)
-#define EP_BIT_BD_ELEMENT	(1<<18)
-#define EP_BIT_SB_ELEMENT	(1<<19)
-#define EP_BIT_GEM		(1<<20)
-#define EP_BIT_INACTIVE		(1<<21)
-#define EP_BIT_EXPLOSIVE	(1<<22)
-#define EP_BIT_MAMPF3		(1<<23)
-#define EP_BIT_PUSHABLE		(1<<24)
-#define EP_BIT_PLAYER		(1<<25)
+#define EP_BIT_AMOEBALIVE	(1 << 0)
+#define EP_BIT_AMOEBOID		(1 << 1)
+#define EP_BIT_SCHLUESSEL	(1 << 2)
+#define EP_BIT_PFORTE		(1 << 3)
+#define EP_BIT_SOLID		(1 << 4)
+#define EP_BIT_MASSIV		(1 << 5)
+#define EP_BIT_SLIPPERY		(1 << 6)
+#define EP_BIT_ENEMY		(1 << 7)
+#define EP_BIT_MAUER		(1 << 8)
+#define EP_BIT_CAN_FALL		(1 << 9)
+#define EP_BIT_CAN_SMASH	(1 << 10)
+#define EP_BIT_CAN_CHANGE	(1 << 11)
+#define EP_BIT_CAN_MOVE		(1 << 12)
+#define EP_BIT_COULD_MOVE	(1 << 13)
+#define EP_BIT_DONT_TOUCH	(1 << 14)
+#define EP_BIT_DONT_GO_TO	(1 << 15)
+#define EP_BIT_MAMPF2		(1 << 16)
+#define EP_BIT_CHAR		(1 << 17)
+#define EP_BIT_BD_ELEMENT	(1 << 18)
+#define EP_BIT_SB_ELEMENT	(1 << 19)
+#define EP_BIT_GEM		(1 << 20)
+#define EP_BIT_INACTIVE		(1 << 21)
+#define EP_BIT_EXPLOSIVE	(1 << 22)
+#define EP_BIT_MAMPF3		(1 << 23)
+#define EP_BIT_PUSHABLE		(1 << 24)
+#define EP_BIT_PLAYER		(1 << 25)
+#define EP_BIT_HAS_CONTENT	(1 << 26)
+#define EP_BIT_EATABLE		(1 << 27)
 
 #define IS_AMOEBALIVE(e)	(Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
 #define IS_AMOEBOID(e)		(Elementeigenschaften[e] & EP_BIT_AMOEBOID)
@@ -143,13 +151,10 @@ typedef int BOOL;
 #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 IS_PLAYER(x,y)		(JX == (x) && JY == (y))
-*/
+#define HAS_CONTENT(e)		(Elementeigenschaften[e] & EP_BIT_HAS_CONTENT)
+#define IS_EATABLE(e)		(Elementeigenschaften[e] & EP_BIT_EATABLE)
 
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
-#define IS_LOCAL_PLAYER(x,y)	(StorePlayer[x][y] == EL_SPIELER1)
 
 #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)
@@ -178,32 +183,33 @@ typedef int BOOL;
 #define PIX_DOOR		1
 #define PIX_HEROES		2
 #define PIX_TOONS		3
-#define	PIX_BIGFONT		4
-#define PIX_SMALLFONT		5
+#define PIX_MORE		4
+#define	PIX_BIGFONT		5
+#define PIX_SMALLFONT		6
 /* Pixmaps without them */
-#define PIX_DB_BACK		6
-#define PIX_DB_DOOR		7
-#define PIX_DB_FIELD		8
+#define PIX_DB_BACK		7
+#define PIX_DB_DOOR		8
+#define PIX_DB_FIELD		9
 
-#define NUM_PICTURES		6
-#define NUM_PIXMAPS		9
+#define NUM_PICTURES		7
+#define NUM_PIXMAPS		10
 
 /* boundaries of arrays etc. */
 #define MAX_NAMELEN		(10+1)
-
 #define MAX_LEVNAMLEN		32
-#define MAX_LEVSCORE_ENTRIES	16
-#define NUM_FREE_LVHD_BYTES	18
-#define MAX_TAPELEN		10000
+#define MAX_TAPELEN		(1000 * 50)	/* max. time * framerate */
+#define MAX_LEVDIR_ENTRIES	100
+#define MAX_SCORE_ENTRIES	100
+#define MAX_ELEMENTS		512
+#define MAX_NUM_AMOEBA		100
 
-#define MAX_LEVDIR_FILENAME	(64+1)
-#define MAX_LEVDIR_NAME		(16+1)
-#define MAX_LEVDIR_ENTRIES	15
-#define MAX_SCORE_ENTRIES	15
+#define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
 
-#define MAX_FILENAME		256
-#define MAX_NUM_AMOEBA		100
-#define MAX_ELEMENTS		512
+/* fundamental game speed values */
+#define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
+#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 */
 
 struct HiScore
 {
@@ -211,34 +217,104 @@ struct HiScore
   int Score;
 };
 
+struct OptionInfo
+{
+  char *display_name;
+  char *server_host;
+  int server_port;
+  char *base_directory;
+  char *level_directory;
+  boolean serveronly;
+  boolean network;
+  boolean verbose;
+};
+
+struct SetupJoystickInfo
+{
+  char *device_name;
+  int xleft, xmiddle, xright;
+  int yupper, ymiddle, ylower;
+  int snap;
+  int bomb;
+};
+
+struct SetupKeyboardInfo
+{
+  KeySym left;
+  KeySym right;
+  KeySym up;
+  KeySym down;
+  KeySym snap;
+  KeySym bomb;
+};
+
+struct SetupInputInfo
+{
+  boolean use_joystick;
+  struct SetupJoystickInfo joy;
+  struct SetupKeyboardInfo key;
+};
+
+struct SetupInfo
+{
+  char *player_name;
+
+  boolean sound;
+  boolean sound_loops;
+  boolean sound_music;
+  boolean sound_simple;
+  boolean toons;
+  boolean double_buffering;
+  boolean direct_draw;		/* !double_buffering (redundant!) */
+  boolean scroll_delay;
+  boolean soft_scrolling;
+  boolean fading;
+  boolean autorecord;
+  boolean quick_doors;
+  boolean team_mode;
+
+  struct SetupInputInfo input[MAX_PLAYERS];
+};
+
+struct SetupFileList
+{
+  char *token;
+  char *value;
+  struct SetupFileList *next;
+};
+
 struct PlayerInfo
 {
-  int nr, active, local;
+  boolean present;		/* player present in level playfield */
+  boolean connected;		/* player connected (locally or via network) */
+  boolean active;		/* player (present && connected) */
 
-  char login_name[MAX_NAMELEN];
-  char alias_name[MAX_NAMELEN];
-  int handicap;
-  unsigned int setup;
-  int leveldir_nr;
-  int level_nr;
+  int index_nr, client_nr, element_nr;
 
-  int jx,jy, last_jx,last_jy;
-  int MovDir, MovPos, GfxPos;
-  int Pushing, Frame;
+  byte action;			/* action from local input device */
+  byte effective_action;	/* action aknowledged from network server
+				   or summarized over all configured input
+				   devices when in single player mode */
 
-  int gone, LevelSolved, GameOver;
+  int joystick_fd;		/* file descriptor of player's joystick */
 
-  long actual_frame_counter;
+  int jx,jy, last_jx,last_jy;
+  int MovDir, MovPos, GfxPos;
+  int Frame;
 
-  int frame_reset_delay;
+  boolean Pushing;
+  boolean gone, LevelSolved, GameOver;
+  boolean snapped;
 
-  long move_delay;
+  unsigned long move_delay;
   int last_move_dir;
 
-  long push_delay;
-  int push_delay_value;
+  unsigned long push_delay;
+  unsigned long push_delay_value;
 
-  int snapped;
+  int frame_reset_delay;
+
+  unsigned long actual_frame_counter;
 
   int score;
   int gems_still_needed;
@@ -257,48 +333,46 @@ struct LevelInfo
   int time;
   int edelsteine;
   char name[MAX_LEVNAMLEN];
-  int score[MAX_LEVSCORE_ENTRIES];
-  int mampfer_inhalt[4][3][3];
+  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;
 };
 
 struct LevelDirInfo
 {
-  char filename[MAX_LEVDIR_FILENAME];
-  char name[MAX_LEVDIR_NAME];
+  char *filename;
+  char *name;
   int levels;
-  int readonly;
+  int sort_priority;
+  boolean user_defined;
+  boolean readonly;
 };
 
-struct RecordingInfo
+struct TapeInfo
 {
   int level_nr;
-  unsigned int random_seed;
+  unsigned long random_seed;
   unsigned long date;
   unsigned long counter;
   unsigned long length;
   unsigned long length_seconds;
   unsigned int delay_played;
-  BOOL pause_before_death;
-  BOOL recording, playing, pausing;
-  BOOL fast_forward;
-  BOOL changed;
+  boolean pause_before_death;
+  boolean recording, playing, pausing;
+  boolean fast_forward;
+  boolean changed;
+  boolean player_participates[MAX_PLAYERS];
   struct
   {
-    unsigned char joystickdata[MAX_PLAYERS];
-    unsigned char delay;
+    byte action[MAX_PLAYERS];
+    byte delay;
   } pos[MAX_TAPELEN];
 };
 
-struct JoystickInfo
-{
-  int xleft, xright, xmiddle;
-  int yupper, ylower, ymiddle;
-};
-
 extern Display	       *display;
 extern Visual	       *visual;
 extern int		screen;
@@ -307,7 +381,7 @@ extern GC		gc, clip_gc[], tile_clip_gc;
 extern Pixmap		pix[];
 extern Pixmap		clipmask[], tile_clipmask[];
 
-#ifdef XPM_INCLUDE_FILE
+#ifdef USE_XPM_LIBRARY
 extern XpmAttributes 	xpm_att[];
 #endif
 
@@ -318,78 +392,74 @@ extern int		sound_pipe[2];
 extern int		sound_device;
 extern char	       *sound_device_name;
 extern int		joystick_device;
-extern char	       *joystick_device_name[2];
-extern char	       *level_directory;
-extern int     		width, height;
+extern char	       *joystick_device_name[];
+
+extern char	       *program_name;
 
 extern int		game_status;
-extern int		game_emulation;
-extern int		button_status, motion_status;
+extern boolean		level_editor_test_game;
+extern boolean		network_playing;
+extern int		button_status;
+extern boolean		motion_status;
 extern int		key_joystick_mapping;
 extern int	    	global_joystick_status, joystick_status;
-extern int		sound_status, sound_on;
-extern int		sound_loops_allowed, sound_loops_on;
-extern int		sound_music_on;
-extern int		sound_simple_on;
-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 int		networking;
-
-extern BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+extern int		sound_status;
+extern boolean		sound_loops_allowed;
+
+extern boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
 extern int		redraw_mask;
 extern int		redraw_tiles;
 
-extern int		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
-extern long		Elementeigenschaften[MAX_ELEMENTS];
+extern short		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+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		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+extern unsigned 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, ScrollStepSize;
 extern int		ScreenMovDir, ScreenMovPos, ScreenGfxPos;
-extern int		GameFrameDelay, MoveSpeed;
+extern int		GameFrameDelay;
+extern int		FfwdFrameDelay;
+extern int		MoveSpeed;
 extern int		BX1,BY1, BX2,BY2;
 extern int		ZX,ZY, ExitX,ExitY;
 extern int		AllPlayersGone;
 extern int		FrameCounter, TimeFrames, TimeLeft;
-extern int		MampferNr, SiebAktiv;
+extern int		MampferMax, MampferNr;
+extern boolean		SiebAktiv;
+extern int		SiebCount;
 
-extern int		TestPlayer;
+extern boolean		network_player_action_received;
 
 extern struct LevelDirInfo	leveldir[];
 extern struct LevelInfo		level;
-extern struct PlayerInfo	stored_player[];
-extern struct PlayerInfo       *local_player;
+extern struct PlayerInfo	stored_player[], *local_player;
 extern struct HiScore		highscore[];
-extern struct RecordingInfo	tape;
+extern struct TapeInfo		tape;
 extern struct SoundInfo		Sound[];
 extern struct JoystickInfo	joystick[];
+extern struct OptionInfo	options;
+extern struct SetupInfo		setup;
+extern struct SetupFileList	*setup_list;
+extern struct SetupFileList	*level_setup_list;
 
 extern char		*sound_name[];
 extern int		background_loop[];
 extern int		num_bg_loops;
 
-extern char		*progname;
-
 
 /* often used screen positions */
 #define SX			8
@@ -400,6 +470,8 @@ extern char		*progname;
 #define DY			60
 #define VX			DX
 #define VY			400
+#define EX			DX
+#define EY			(VY - 44)
 #define TILEX			32
 #define TILEY			32
 #define MINI_TILEX		(TILEX/2)
@@ -416,6 +488,8 @@ extern char		*progname;
 #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)
@@ -442,6 +516,13 @@ extern char		*progname;
 #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	208
+#define MORE_PER_LINE		8
+#define MINI_MORE_PER_LINE	16
+#define MICRO_MORE_PER_LINE	16
 #define FONT_CHARS_PER_LINE	16
 #define FONT_LINES_PER_FONT	4
 
@@ -470,8 +551,8 @@ extern char		*progname;
 #define EL_MORAST_VOLL		17
 #define EL_TROPFEN		18
 #define EL_BOMBE		19
-#define EL_SIEB_LEER		20
-#define EL_SIEB_VOLL		21
+#define EL_SIEB_INAKTIV		20
+#define EL_SPEED_PILL		21
 #define EL_SALZSAEURE		22
 #define EL_AMOEBE_NASS		23
 #define EL_AMOEBE_NORM		24
@@ -511,8 +592,10 @@ extern char		*progname;
 #define EL_ERZ_EDEL_BD		58
 #define EL_ERZ_EDEL_GELB	59
 #define EL_MAMPFER2		60
-#define EL_SIEB2_LEER		61
-#define EL_SIEB2_VOLL		62
+#define EL_SIEB2_INAKTIV	61
+
+#define EL_UNUSED_62		62
+
 #define EL_DYNABOMB		63
 #define EL_DYNABOMB_NR		64
 #define EL_DYNABOMB_SZ		65
@@ -563,10 +646,14 @@ extern char		*progname;
 #define EL_BADEWANNE3		102
 #define EL_BADEWANNE4		103
 #define EL_BADEWANNE5		104
-#define EL_SIEB_TOT		105
-#define EL_AUSGANG_ACT		106
+
+#define EL_UNUSED_105		105
+#define EL_UNUSED_106		106
+
 #define EL_AUSGANG_AUF		107
-#define EL_SIEB2_TOT		108
+
+#define EL_UNUSED_108		108
+
 #define EL_AMOEBA2DIAM		109
 #define EL_MAULWURF		110
 #define EL_PINGUIN		111
@@ -611,29 +698,99 @@ extern char		*progname;
 #define EL_CHAR_COPY		(EL_CHAR_ASCII0+94)
 #define EL_CHAR_END		(EL_CHAR_START+79)
 
-#define EL_UNUSED_200		200
-/* ... */
+#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_SP_START		210
+#define EL_SP_EMPTY		(EL_SP_START + 0)
+#define EL_SP_ZONK		(EL_SP_START + 1)
+#define EL_SP_BASE		(EL_SP_START + 2)
+#define EL_SP_MURPHY		(EL_SP_START + 3)
+#define EL_SP_INFOTRON		(EL_SP_START + 4)
+#define EL_SP_CHIP_SINGLE	(EL_SP_START + 5)
+#define EL_SP_HARD_GRAY		(EL_SP_START + 6)
+#define EL_SP_EXIT		(EL_SP_START + 7)
+#define EL_SP_DISK_ORANGE	(EL_SP_START + 8)
+#define EL_SP_PORT1_RIGHT	(EL_SP_START + 9)
+#define EL_SP_PORT1_DOWN	(EL_SP_START + 10)
+#define EL_SP_PORT1_LEFT	(EL_SP_START + 11)
+#define EL_SP_PORT1_UP		(EL_SP_START + 12)
+#define EL_SP_PORT2_RIGHT	(EL_SP_START + 13)
+#define EL_SP_PORT2_DOWN	(EL_SP_START + 14)
+#define EL_SP_PORT2_LEFT	(EL_SP_START + 15)
+#define EL_SP_PORT2_UP		(EL_SP_START + 16)
+#define EL_SP_SNIKSNAK		(EL_SP_START + 17)
+#define EL_SP_DISK_YELLOW	(EL_SP_START + 18)
+#define EL_SP_TERMINAL		(EL_SP_START + 19)
+#define EL_SP_DISK_RED		(EL_SP_START + 20)
+#define EL_SP_PORT_Y		(EL_SP_START + 21)
+#define EL_SP_PORT_X		(EL_SP_START + 22)
+#define EL_SP_PORT_XY		(EL_SP_START + 23)
+#define EL_SP_ELECTRON		(EL_SP_START + 24)
+#define EL_SP_BUG		(EL_SP_START + 25)
+#define EL_SP_CHIP_LEFT		(EL_SP_START + 26)
+#define EL_SP_CHIP_RIGHT	(EL_SP_START + 27)
+#define EL_SP_HARD_BASE1	(EL_SP_START + 28)
+#define EL_SP_HARD_GREEN	(EL_SP_START + 29)
+#define EL_SP_HARD_BLUE		(EL_SP_START + 30)
+#define EL_SP_HARD_RED		(EL_SP_START + 31)
+#define EL_SP_HARD_YELLOW	(EL_SP_START + 32)
+#define EL_SP_HARD_BASE2	(EL_SP_START + 33)
+#define EL_SP_HARD_BASE3	(EL_SP_START + 34)
+#define EL_SP_HARD_BASE4	(EL_SP_START + 35)
+#define EL_SP_HARD_BASE5	(EL_SP_START + 36)
+#define EL_SP_HARD_BASE6	(EL_SP_START + 37)
+#define EL_SP_CHIP_UPPER	(EL_SP_START + 38)
+#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_UNUSED_254		254
 #define EL_UNUSED_255		255
 
-/* "unreal" runtime elements */
-#define EL_BLOCKED		300
-#define EL_EXPLODING		301
-#define EL_CRACKINGNUT		302
-#define EL_BLURB_LEFT		303
-#define EL_BLURB_RIGHT		304
-#define EL_AMOEBING		305
-#define EL_MAUERND		306
-#define EL_BURNING		307
-#define EL_PLAYER_IS_LEAVING	308
+/* "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
+
+/* "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
 
 /* game graphics:
-**	  0 - 255: graphics from "RocksScreen"
+**	  0 - 209: graphics from "RocksScreen"
+**	210 - 255: graphics from "RocksMore"
 **	256 - 511: graphics from "RocksFont"
 **	512 - 767: graphics from "RocksHeroes"
 */
 
 #define GFX_START_ROCKSSCREEN	0
-#define GFX_END_ROCKSSCREEN	255
+#define GFX_END_ROCKSSCREEN	209
+#define GFX_START_ROCKSMORE	210
+#define GFX_END_ROCKSMORE	255
 #define GFX_START_ROCKSFONT	256
 #define GFX_END_ROCKSFONT	511
 #define GFX_START_ROCKSHEROES	512
@@ -732,9 +889,10 @@ extern char		*progname;
 #define GFX_SOKOBAN_FELD_VOLL	123
 #define GFX_GEBLUBBER		124
 /* Zeile 8 (128) */
-#define GFX_SIEB_LEER		128
-#define GFX_SIEB_VOLL		GFX_SIEB_LEER
-#define GFX_SIEB_TOT		GFX_SIEB_LEER
+#define GFX_SIEB_INAKTIV	128
+#define GFX_SIEB_LEER		GFX_SIEB_INAKTIV
+#define GFX_SIEB_VOLL		GFX_SIEB_INAKTIV
+#define GFX_SIEB_TOT		GFX_SIEB_INAKTIV
 #define GFX_ERZ_EDEL		132
 #define GFX_ERZ_DIAM		133
 #define GFX_ERZ_EDEL_ROT	134
@@ -751,20 +909,27 @@ extern char		*progname;
 #define GFX_MAULWURF		145
 #define GFX_SCHWEIN		146
 #define GFX_DRACHE		147
+#define GFX_MAUER_XY		148
+#define GFX_MAUER_X		149
+#define GFX_MAUER_Y		150
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
+#define GFX_SPEED_PILL		158
 #define GFX_SONDE		159
 /* Zeile 10 (160) */
 #define GFX_EDELSTEIN_BD	163
-#define GFX_MAUER_R1		165
+#define GFX_MAUER_RIGHT		165
+#define GFX_MAUER_R1		GFX_MAUER_RIGHT
 #define GFX_MAUER_R		167
-#define GFX_MAUER_L1		168
+#define GFX_MAUER_LEFT		168
+#define GFX_MAUER_L1		GFX_MAUER_LEFT
 #define GFX_MAUER_L		170
 #define GFX_MAUER_LEBT		171
-#define GFX_SIEB2_LEER		172
-#define GFX_SIEB2_VOLL		GFX_SIEB2_LEER
-#define GFX_SIEB2_TOT		GFX_SIEB2_LEER
+#define GFX_SIEB2_INAKTIV	172
+#define GFX_SIEB2_LEER		GFX_SIEB2_INAKTIV
+#define GFX_SIEB2_VOLL		GFX_SIEB2_INAKTIV
+#define GFX_SIEB2_TOT		GFX_SIEB2_INAKTIV
 /* Zeile 11 (176) */
 #define	GFX_AUSGANG_ZU		176
 #define	GFX_AUSGANG_ACT		177
@@ -792,9 +957,7 @@ extern char		*progname;
 #define GFX_SCHLUESSEL		GFX_SCHLUESSEL1
 #define GFX_SPIELFIGUR		GFX_SPIELER1
 
-
 /* graphics from "RocksHeroes" */
-
 #define GFX_SPIELER1_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 0)
 #define GFX_SPIELER1_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 4)
 #define GFX_SPIELER1_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 0)
@@ -819,6 +982,9 @@ extern char		*progname;
 #define GFX_SPIELER4_RIGHT	(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 4)
 #define GFX_SPIELER4_PUSH_RIGHT	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 0)
 #define GFX_SPIELER4_PUSH_LEFT	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 4)
+#define GFX_MAUER_DOWN		(GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 0)
+#define GFX_MAUER_UP		(GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 3)
+
 #define GFX_SONDE_START		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 8)
 #define GFX_SCHWEIN_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 8)
 #define GFX_SCHWEIN_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE +12)
@@ -845,6 +1011,48 @@ extern char		*progname;
 #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_PRE_LINE + 0)
+#define GFX_SP_ZONK		(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 1)
+#define GFX_SP_BASE		(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 2)
+#define GFX_SP_MURPHY		(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 3)
+#define GFX_SP_INFOTRON		(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 4)
+#define GFX_SP_CHIP_SINGLE	(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 5)
+#define GFX_SP_HARD_GRAY	(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 6)
+#define GFX_SP_EXIT		(GFX_START_ROCKSMORE +  0 * MORE_PRE_LINE + 7)
+#define GFX_SP_DISK_ORANGE	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 0)
+#define GFX_SP_PORT1_RIGHT	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 1)
+#define GFX_SP_PORT1_DOWN	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 2)
+#define GFX_SP_PORT1_LEFT	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 3)
+#define GFX_SP_PORT1_UP		(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 4)
+#define GFX_SP_PORT2_RIGHT	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 5)
+#define GFX_SP_PORT2_DOWN	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 6)
+#define GFX_SP_PORT2_LEFT	(GFX_START_ROCKSMORE +  1 * MORE_PRE_LINE + 7)
+#define GFX_SP_PORT2_UP		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 0)
+#define GFX_SP_SNIKSNAK		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 1)
+#define GFX_SP_DISK_YELLOW	(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 2)
+#define GFX_SP_TERMINAL		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 3)
+#define GFX_SP_DISK_RED		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 4)
+#define GFX_SP_PORT_Y		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 5)
+#define GFX_SP_PORT_X		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 6)
+#define GFX_SP_PORT_XY		(GFX_START_ROCKSMORE +  2 * MORE_PRE_LINE + 7)
+#define GFX_SP_ELECTRON		(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 0)
+#define GFX_SP_BUG		(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 1)
+#define GFX_SP_CHIP_LEFT	(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 2)
+#define GFX_SP_CHIP_RIGHT	(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 3)
+#define GFX_SP_HARD_BASE1	(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 4)
+#define GFX_SP_HARD_GREEN	(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 5)
+#define GFX_SP_HARD_BLUE	(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 6)
+#define GFX_SP_HARD_RED		(GFX_START_ROCKSMORE +  3 * MORE_PRE_LINE + 7)
+#define GFX_SP_HARD_YELLOW	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 0)
+#define GFX_SP_HARD_BASE2	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 1)
+#define GFX_SP_HARD_BASE3	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 2)
+#define GFX_SP_HARD_BASE4	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 3)
+#define GFX_SP_HARD_BASE5	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 4)
+#define GFX_SP_HARD_BASE6	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 5)
+#define GFX_SP_CHIP_UPPER	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 6)
+#define GFX_SP_CHIP_LOWER	(GFX_START_ROCKSMORE +  4 * MORE_PRE_LINE + 7)
+
 /* graphics from "RocksFont" */
 #define GFX_CHAR_START		(GFX_START_ROCKSFONT)
 #define GFX_CHAR_ASCII0		(GFX_CHAR_START-32)
@@ -877,19 +1085,6 @@ extern char		*progname;
 #define GFX_CHAR_COPY		(GFX_CHAR_ASCII0+94)
 #define GFX_CHAR_END		(GFX_CHAR_START+79)
 
-/* score for elements */
-#define SC_EDELSTEIN		0
-#define SC_DIAMANT		1
-#define SC_KAEFER		2
-#define SC_FLIEGER		3
-#define SC_MAMPFER		4
-#define SC_ROBOT		5
-#define SC_PACMAN		6
-#define SC_KOKOSNUSS		7
-#define SC_DYNAMIT		8
-#define SC_SCHLUESSEL		9
-#define SC_ZEITBONUS		10
-
 /* the names of the sounds */
 #define SND_ALCHEMY		0
 #define SND_AMOEBE		1
@@ -946,20 +1141,23 @@ extern char		*progname;
 
 #define NUM_SOUNDS		52
 
-#define IS_LOOP_SOUND(s)	((s)==SND_KLAPPER || (s)==SND_ROEHR ||	\
-				 (s)==SND_NJAM || (s)==SND_MIEP)
-#define IS_MUSIC_SOUND(s)	((s)==SND_ALCHEMY || (s)==SND_CHASE || \
-				 (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
-				 (s)==SND_TYGER || (s)==SND_VOYAGER || \
-				 (s)==SND_TWILIGHT)
-
+/* default input keys */
+#define KEY_UNDEFINDED		XK_VoidSymbol
+#define DEFAULT_KEY_LEFT	XK_Left
+#define DEFAULT_KEY_RIGHT	XK_Right
+#define DEFAULT_KEY_UP		XK_Up
+#define DEFAULT_KEY_DOWN	XK_Down
+#define DEFAULT_KEY_SNAP	XK_Shift_L
+#define DEFAULT_KEY_BOMB	XK_Shift_R
+#define DEFAULT_KEY_OKAY	XK_Return
+#define DEFAULT_KEY_CANCEL	XK_Escape
 
 /* directions for moving */
 #define MV_NO_MOVING		0
-#define MV_LEFT			(1<<0)
-#define MV_RIGHT		(1<<1)
-#define MV_UP			(1<<2)
-#define MV_DOWN	       		(1<<3)
+#define MV_LEFT			(1 << 0)
+#define MV_RIGHT		(1 << 1)
+#define MV_UP			(1 << 2)
+#define MV_DOWN	       		(1 << 3)
 
 /* font types */
 #define FS_SMALL		0
@@ -973,94 +1171,37 @@ extern char		*progname;
 #define FC_SPECIAL2		5
 
 /* values for game_status */
-#define MAINMENU		0
-#define PLAYING			1
-#define LEVELED			2
-#define HELPSCREEN		3
-#define CHOOSELEVEL		4
-#define TYPENAME		5
-#define HALLOFFAME		6
-#define SETUP			7
-#define EXITGAME		8
-
-/* values for game_emulation */
-#define EMU_NONE		0
-#define EMU_BOULDERDASH		1
-#define EMU_SOKOBAN		2
-
+#define EXITGAME		0
+#define MAINMENU		1
+#define PLAYING			2
+#define LEVELED			3
+#define HELPSCREEN		4
+#define CHOOSELEVEL		5
+#define TYPENAME		6
+#define HALLOFFAME		7
+#define SETUP			8
+#define SETUPINPUT		9
+#define CALIBRATION		10
 
 #ifndef GAME_DIR
 #define GAME_DIR		"."
 #endif
 
-#ifndef GFX_PATH
-#define GFX_PATH		GAME_DIR "/graphics"
-#endif
-#ifndef SND_PATH
-#define SND_PATH		GAME_DIR "/sounds"
-#endif
-#ifndef LEVEL_PATH
-#define LEVEL_PATH		GAME_DIR "/levels"
-#endif
-#ifndef SCORE_PATH
-#define SCORE_PATH		LEVEL_PATH
-#endif
-#ifndef NAMES_PATH
-#define NAMES_PATH		LEVEL_PATH
-#endif
-#ifndef CONFIG_PATH
-#define CONFIG_PATH		GAME_DIR
-#endif
-#ifndef JOYDAT_PATH
-#define JOYDAT_PATH		GAME_DIR
-#endif
+#define BASE_PATH		GAME_DIR
 
-#ifndef MSDOS
-#define SCORE_FILENAME		"ROCKS.score"
-#define NAMES_FILENAME		"ROCKS.names"
-#define LEVDIR_FILENAME		"ROCKS.levelinfo"
-#define JOYDAT_FILENAME		"ROCKS.joystick"
-#else
-#define SCORE_FILENAME		"ROCKS.sco"
-#define NAMES_FILENAME		"ROCKS.nam"
-#define LEVDIR_FILENAME		"ROCKS.lev"
-#define JOYDAT_FILENAME		"ROCKS.joy"
-#endif
+#define GRAPHICS_DIRECTORY	"graphics"
+#define SOUNDS_DIRECTORY	"sounds"
+#define LEVELS_DIRECTORY	"levels"
+#define TAPES_DIRECTORY		"tapes"
+#define SCORES_DIRECTORY	"scores"
 
-#define JOYDAT_FILE		JOYDAT_PATH "/" JOYDAT_FILENAME
-
-#define LEVEL_PERMS	(S_IRUSR|S_IWUSR | S_IRGRP|S_IWGRP | S_IROTH|S_IWOTH)
-#define SCORE_PERMS		LEVEL_PERMS
-#define NAMES_PERMS		LEVEL_PERMS
-#define LEVDIR_PERMS		LEVEL_PERMS
-#define LEVREC_PERMS		LEVEL_PERMS
-#define JOYDAT_PERMS		LEVEL_PERMS
-
-/* old cookies */
-#define NAMES_COOKIE_10		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.0"
-#define LEVELREC_COOKIE_10	"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
-
-#define LEVEL_COOKIE		"ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0"
-#define SCORE_COOKIE		"ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.0"
-#define NAMES_COOKIE		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.1"
-#define LEVELDIR_COOKIE		"ROCKSNDIAMONDS_LEVELDIR_FILE_VERSION_1.0"
-#define LEVELREC_COOKIE		"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.2"
-#define JOYSTICK_COOKIE		"ROCKSNDIAMONDS_JOYSTICK_FILE_VERSION_1.0"
-#define LEVEL_COOKIE_LEN	(strlen(LEVEL_COOKIE)+1)
-#define SCORE_COOKIE_LEN	(strlen(SCORE_COOKIE)+1)
-#define NAMES_COOKIE_LEN	(strlen(NAMES_COOKIE)+1)
-#define LEVELDIR_COOKIE_LEN	(strlen(LEVELDIR_COOKIE)+1)
-#define LEVELREC_COOKIE_LEN	(strlen(LEVELREC_COOKIE)+1)
-#define JOYSTICK_COOKIE_LEN	(strlen(JOYSTICK_COOKIE)+1)
-
-#define VERSION_STRING		"1.2"
+#define VERSION_STRING		"1.2.0"
 #define GAMETITLE_STRING	"Rocks'n'Diamonds"
 #define WINDOWTITLE_STRING	GAMETITLE_STRING " " VERSION_STRING
 #define COPYRIGHT_STRING	"Copyright ^1995-98 by Holger Schemel"
 
-/* Leerer Login- und Alias-Name */
-#define EMPTY_LOGIN		"NO_LOGIN"
-#define EMPTY_ALIAS		"NO_NAME"
+/* default name for empty highscore entry */
+#define EMPTY_PLAYER_NAME	"no name"
 
 /* values for button_status */
 #define MB_NOT_PRESSED		FALSE
@@ -1078,73 +1219,44 @@ extern char		*progname;
 #define MB_RIGHT		3
 #endif
 
-/* values for key_status */
-#define KEY_NOT_PRESSED		FALSE
-#define KEY_RELEASED		FALSE
-#define KEY_PRESSED		TRUE
-
 /* 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_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_DOORS	(REDRAW_DOOR_1 | REDRAW_DOOR_2)
+#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
 
-/* positions in the game control window */
-#define XX_LEVEL		37
-#define YY_LEVEL		20
-#define XX_EMERALDS		29
-#define YY_EMERALDS		54
-#define XX_DYNAMITE		29
-#define YY_DYNAMITE		89
-#define XX_KEYS			18
-#define YY_KEYS			123
-#define XX_SCORE		15
-#define YY_SCORE		159
-#define XX_TIME			29
-#define YY_TIME			194
-
-#define DX_LEVEL		(DX+XX_LEVEL)
-#define DY_LEVEL		(DY+YY_LEVEL)
-#define DX_EMERALDS		(DX+XX_EMERALDS)
-#define DY_EMERALDS		(DY+YY_EMERALDS)
-#define DX_DYNAMITE		(DX+XX_DYNAMITE)
-#define DY_DYNAMITE		(DY+YY_DYNAMITE)
-#define DX_KEYS			(DX+XX_KEYS)
-#define DY_KEYS			(DY+YY_KEYS)
-#define DX_SCORE		(DX+XX_SCORE)
-#define DY_SCORE		(DY+YY_SCORE)
-#define DX_TIME			(DX+XX_TIME)
-#define DY_TIME			(DY+YY_TIME)
-
-/* Felder in PIX_DOOR */
-/* Bedeutung in PIX_DB_DOOR: (3 PAGEs)
-   PAGEX1: 1. Zwischenspeicher für DOOR_1
-   PAGEX2: 2. Zwischenspeicher für DOOR_1
-   PAGEX3: Pufferspeicher für Animationen
+/* areas in pixmap PIX_DOOR */
+/* meaning in PIX_DB_DOOR: (3 PAGEs)
+   PAGEX1: 1. buffer for DOOR_1
+   PAGEX2: 2. buffer for DOOR_1
+   PAGEX3: buffer for animations
 */
 
 #define DOOR_GFX_PAGESIZE	DXSIZE
-#define DOOR_GFX_PAGEX1		(0*DOOR_GFX_PAGESIZE)
-#define DOOR_GFX_PAGEX2		(1*DOOR_GFX_PAGESIZE)
-#define DOOR_GFX_PAGEX3		(2*DOOR_GFX_PAGESIZE)
-#define DOOR_GFX_PAGEX4		(3*DOOR_GFX_PAGESIZE)
-#define DOOR_GFX_PAGEX5		(4*DOOR_GFX_PAGESIZE)
-#define DOOR_GFX_PAGEX6		(5*DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX1		(0 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX2		(1 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX3		(2 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX4		(3 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX5		(4 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX6		(5 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX7		(6 * DOOR_GFX_PAGESIZE)
+#define DOOR_GFX_PAGEX8		(7 * DOOR_GFX_PAGESIZE)
 #define DOOR_GFX_PAGEY1		0
 #define DOOR_GFX_PAGEY2		DYSIZE
 
-/* für DrawGraphicAnimation (tools.c) und AnimateToon (cartoons.c) */
+/* for DrawGraphicAnimation() [tools.c] and AnimateToon() [cartoons.c] */
 #define ANIM_NORMAL	0
 #define ANIM_OSCILLATE	1
 #define ANIM_REVERSE	2
 
-#endif
+#endif	/* MAIN_H */