X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=b5b016345676b67a88183e5e3126ab1ef7f69a58;hb=67758fda340e825f188fc6a4caad03381bf031dc;hp=a4ea04764b5d545e1a8586c8fb5dcf2e7f7e7966;hpb=0a52f54d2f6ab7dce8062c7738ede185ba5acad3;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index a4ea0476..b5b01634 100644
--- a/src/main.h
+++ b/src/main.h
@@ -17,9 +17,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 #ifndef MSDOS
 #define XK_MISCELLANY
@@ -33,18 +33,23 @@
 #include <X11/keysymdef.h>
 
 #ifdef   XPM_INCLUDE_FILE
+#define  USE_XPM_LIBRARY
 #include XPM_INCLUDE_FILE
 #endif
 #else	/* MSDOS */
 #include "msdos.h"
 #endif  /* MSDOS */
 
+#ifdef DEBUG
+#define DEBUG_TIMING	0
+#endif
+
 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
@@ -91,32 +96,35 @@ 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)
 
-#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 EP_BIT_SP_ELEMENT	(1 << 28)
 
 #define IS_AMOEBALIVE(e)	(Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
 #define IS_AMOEBOID(e)		(Elementeigenschaften[e] & EP_BIT_AMOEBOID)
@@ -144,6 +152,9 @@ typedef unsigned char byte;
 #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 IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
@@ -174,33 +185,33 @@ typedef unsigned char byte;
 #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_OPTION_LEN		256
-#define MAX_FILENAME_LEN	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
 {
@@ -213,6 +224,8 @@ struct OptionInfo
   char *display_name;
   char *server_host;
   int server_port;
+  char *base_directory;
+  char *level_directory;
   boolean serveronly;
   boolean network;
   boolean verbose;
@@ -220,6 +233,9 @@ struct OptionInfo
 
 struct SetupJoystickInfo
 {
+  char *device_name;
+  int xleft, xmiddle, xright;
+  int yupper, ymiddle, ylower;
   int snap;
   int bomb;
 };
@@ -234,26 +250,32 @@ struct SetupKeyboardInfo
   KeySym bomb;
 };
 
+struct SetupInputInfo
+{
+  boolean use_joystick;
+  struct SetupJoystickInfo joy;
+  struct SetupKeyboardInfo key;
+};
+
 struct SetupInfo
 {
-  boolean sound_on;
-  boolean sound_loops_on;
-  boolean sound_music_on;
-  boolean sound_simple_on;
-  boolean toons_on;
-  boolean direct_draw_on;
-  boolean scroll_delay_on;
-  boolean soft_scrolling_on;
-  boolean fading_on;
-  boolean autorecord_on;
+  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;
-  struct
-  {
-    boolean use_joystick;
-    int joystick_nr;
-    struct SetupJoystickInfo joy;
-    struct SetupKeyboardInfo key;
-  } input[MAX_PLAYERS];
+  boolean team_mode;
+
+  struct SetupInputInfo input[MAX_PLAYERS];
 };
 
 struct SetupFileList
@@ -271,11 +293,12 @@ struct PlayerInfo
 
   int index_nr, client_nr, element_nr;
 
-  byte action;			/* action from server or for local playing */
-  byte potential_action;	/* must go to network server first */
+  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 */
 
-  char login_name[MAX_NAMELEN];
-  char alias_name[MAX_NAMELEN];
+  int joystick_fd;		/* file descriptor of player's joystick */
 
   int jx,jy, last_jx,last_jy;
   int MovDir, MovPos, GfxPos;
@@ -285,15 +308,15 @@ struct PlayerInfo
   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 frame_reset_delay;
 
-  long actual_frame_counter;
+  unsigned long actual_frame_counter;
 
   int score;
   int gems_still_needed;
@@ -312,23 +335,26 @@ 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 long random_seed;
@@ -341,6 +367,7 @@ struct RecordingInfo
   boolean recording, playing, pausing;
   boolean fast_forward;
   boolean changed;
+  boolean player_participates[MAX_PLAYERS];
   struct
   {
     byte action[MAX_PLAYERS];
@@ -348,12 +375,6 @@ struct RecordingInfo
   } pos[MAX_TAPELEN];
 };
 
-struct JoystickInfo
-{
-  int xleft, xright, xmiddle;
-  int yupper, ylower, ymiddle;
-};
-
 extern Display	       *display;
 extern Visual	       *visual;
 extern int		screen;
@@ -362,7 +383,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
 
@@ -373,14 +394,12 @@ 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 boolean		level_editor_test_game;
 extern boolean		network_playing;
 extern int		button_status;
 extern boolean		motion_status;
@@ -421,16 +440,17 @@ 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 boolean		network_player_action_received;
-extern int		TestPlayer;
 
 extern struct LevelDirInfo	leveldir[];
 extern struct LevelInfo		level;
 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;
@@ -452,6 +472,8 @@ extern int		num_bg_loops;
 #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)
@@ -468,6 +490,8 @@ extern int		num_bg_loops;
 #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)
@@ -494,6 +518,13 @@ extern int		num_bg_loops;
 #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		16
+#define MINI_MORE_PER_LINE	16
+#define MICRO_MORE_PER_LINE	16
 #define FONT_CHARS_PER_LINE	16
 #define FONT_LINES_PER_FONT	4
 
@@ -522,8 +553,8 @@ extern int		num_bg_loops;
 #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
@@ -563,8 +594,10 @@ extern int		num_bg_loops;
 #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
@@ -615,10 +648,14 @@ extern int		num_bg_loops;
 #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
@@ -663,39 +700,108 @@ 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_MAUER_X		200
 #define EL_MAUER_Y		201
 #define EL_MAUER_XY		202
 
-#define EL_UNUSED_200		203
-/* ... */
+#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
+#define EL_SP_TERMINAL_ACTIVE	307
+
+/* "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"
-**	256 - 511: graphics from "RocksFont"
-**	512 - 767: graphics from "RocksHeroes"
+**	  0 -  255: graphics from "RocksScreen"
+**	256 -  511: graphics from "RocksMore"
+**	512 -  767: graphics from "RocksFont"
+**	768 - 1023: graphics from "RocksHeroes"
 */
 
 #define GFX_START_ROCKSSCREEN	0
 #define GFX_END_ROCKSSCREEN	255
-#define GFX_START_ROCKSFONT	256
-#define GFX_END_ROCKSFONT	511
-#define GFX_START_ROCKSHEROES	512
-#define GFX_END_ROCKSHEROES	767
+#define GFX_START_ROCKSMORE	256
+#define GFX_END_ROCKSMORE	511
+#define GFX_START_ROCKSFONT	512
+#define GFX_END_ROCKSFONT	767
+#define GFX_START_ROCKSHEROES	768
+#define GFX_END_ROCKSHEROES	1023
 
-#define NUM_TILES		768
+#define NUM_TILES		1024
 
 /* graphics from "RocksScreen" */
 /* Zeile 0 (0) */
@@ -788,9 +894,10 @@ extern int		num_bg_loops;
 #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
@@ -813,6 +920,7 @@ extern int		num_bg_loops;
 #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
@@ -823,9 +931,10 @@ extern int		num_bg_loops;
 #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
@@ -853,9 +962,7 @@ extern int		num_bg_loops;
 #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)
@@ -909,6 +1016,59 @@ 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_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_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 "RocksFont" */
 #define GFX_CHAR_START		(GFX_START_ROCKSFONT)
 #define GFX_CHAR_ASCII0		(GFX_CHAR_START-32)
@@ -941,19 +1101,6 @@ extern int		num_bg_loops;
 #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
@@ -1010,13 +1157,6 @@ extern int		num_bg_loops;
 
 #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
@@ -1030,10 +1170,10 @@ extern int		num_bg_loops;
 
 /* 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
@@ -1047,107 +1187,37 @@ extern int		num_bg_loops;
 #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 SETUPINPUT		8
-#define EXITGAME		9
-
-/* 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
-#ifndef SETUP_PATH
-#define SETUP_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"
-#define SETUP_FILENAME		"ROCKS.setup"
-#define LEVELSETUP_FILENAME	"ROCKS.levelsetup"
-#else
-#define SCORE_FILENAME		"ROCKS.sco"
-#define NAMES_FILENAME		"ROCKS.nam"
-#define LEVDIR_FILENAME		"ROCKS.lev"
-#define JOYDAT_FILENAME		"ROCKS.joy"
-#define SETUP_FILENAME		"ROCKS.set"
-#define LEVELSETUP_FILENAME	"ROCKS.lvs"
-#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
-#define SETUP_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 SETUP_COOKIE		"ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2"
-#define LEVELSETUP_COOKIE	"ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2"
-#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 SETUP_COOKIE_LEN	(strlen(SETUP_COOKIE)+1)
-#define LEVELSETUP_COOKIE_LEN	(strlen(LEVELSETUP_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
@@ -1165,71 +1235,42 @@ extern int		num_bg_loops;
 #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