X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=d34fbb96085bbae64644fcad02f29afde17b0bd2;hp=6cf2bb23891b4c939dbb1b3ba4c6240afad33b8e;hb=c4baa69cc8d5e8398425e67498b49f4b77f8e477;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56

diff --git a/src/main.h b/src/main.h
index 6cf2bb23..d34fbb96 100644
--- a/src/main.h
+++ b/src/main.h
@@ -15,20 +15,23 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#ifndef MSDOS
 #define XK_MISCELLANY
 #define XK_LATIN1
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xatom.h>
 #include <X11/Xos.h>
 #include <X11/Intrinsic.h>
 #include <X11/keysymdef.h>
 
 #ifdef   XPM_INCLUDE_FILE
 #include XPM_INCLUDE_FILE
-#else
-#include "YOU HAVE TO SET 'XPM_INCLUDE_FILE' IN THE 'Makefile'!!!"
 #endif
+#else
+#include "msdos.h"
+#endif  // von #ifndef MSDOS
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -39,15 +42,24 @@
 
 typedef int BOOL;
 
-#define TRUE		1
-#define FALSE		0
+#ifndef FALSE
+#define FALSE 0
+#define TRUE (!FALSE)
+#endif
 
-#define WIN_XPOS	0
-#define WIN_YPOS	0
 #define WIN_XSIZE	672
 #define WIN_YSIZE	560
+#ifndef MSDOS
+#define WIN_XPOS	0
+#define WIN_YPOS	0
+#else
+#define WIN_XPOS	(XRES-WIN_XSIZE)/2
+#define WIN_YPOS	(YRES-WIN_YSIZE)/2
+#endif
 #define SCR_FIELDX	17
 #define SCR_FIELDY	17
+#define MAX_BUF_XSIZE	(SCR_FIELDX + 2)
+#define MAX_BUF_YSIZE	(SCR_FIELDY + 2)
 
 #define MIN_LEV_FIELDX	(SCR_FIELDX-2)
 #define MIN_LEV_FIELDY	(SCR_FIELDY-2)
@@ -56,18 +68,32 @@ typedef int BOOL;
 #define MAX_LEV_FIELDX	128
 #define MAX_LEV_FIELDY	128
 
+#ifndef MIN
 #define MIN(a,b) 	((a)<(b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a,b) 	((a)>(b) ? (a) : (b))
+#endif
+#ifndef ABS
 #define ABS(a)		((a)<0 ? -(a) : (a))
+#endif
+#ifndef SIGN
 #define SIGN(a)		((a)<0 ? -1 : ((a)>0 ? 1 : 0))
+#endif
 #define SCROLLX(a)	((a)-scroll_x)
 #define SCROLLY(a)	((a)-scroll_y)
 #define UNSCROLLX(a)	((a)+scroll_x)
 #define UNSCROLLY(a)	((a)+scroll_y)
-#define IN_SCR_FIELD(x,y) ((x)>=0 && (x)<SCR_FIELDX && (y)>=0 &&(y)<SCR_FIELDY)
+#define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
 #define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
 
+
 #define IS_PLAYER(x,y)		(JX==(x) && JY==(y))
+
+/*
+#define IS_PLAYER(x,y)		((JX==(x) && JY==(y)) || (lastJX==(x) && lastJY==(y)))
+*/
+
 #define IS_FREE(x,y)		(Feld[x][y]==EL_LEERRAUM && !IS_PLAYER(x,y))
 #define IS_FREE_OR_PLAYER(x,y)	(Feld[x][y]==EL_LEERRAUM)
 #define IS_MOVING(x,y)		(MovPos[x][y]!=0)
@@ -75,31 +101,32 @@ typedef int BOOL;
 
 #define EP_BIT_AMOEBALIVE	(1<<0)
 #define EP_BIT_AMOEBOID		(1<<1)
-#define EP_BIT_BADEWANNOID	(1<<2)
-#define EP_BIT_SCHLUESSEL	(1<<3)
-#define EP_BIT_PFORTE		(1<<4)
-#define EP_BIT_SOLID		(1<<5)
-#define EP_BIT_MASSIV		(1<<6)
-#define EP_BIT_SLIPPERY		(1<<7)
-#define EP_BIT_ENEMY		(1<<8)
-#define EP_BIT_MAUER		(1<<9)
-#define EP_BIT_CAN_FALL		(1<<10)
-#define EP_BIT_CAN_SMASH	(1<<11)
-#define EP_BIT_CAN_CHANGE	(1<<12)
-#define EP_BIT_CAN_MOVE		(1<<13)
-#define EP_BIT_COULD_MOVE	(1<<14)
-#define EP_BIT_DONT_TOUCH	(1<<15)
-#define EP_BIT_DONT_GO_TO	(1<<16)
-#define EP_BIT_MAMPF2		(1<<17)
-#define EP_BIT_CHAR		(1<<18)
-#define EP_BIT_BD_ELEMENT	(1<<19)
-#define EP_BIT_SB_ELEMENT	(1<<20)
-#define EP_BIT_GEM		(1<<21)
-#define EP_BIT_INACTIVE		(1<<22)
+#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 IS_AMOEBALIVE(e)	(Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
 #define IS_AMOEBOID(e)		(Elementeigenschaften[e] & EP_BIT_AMOEBOID)
-#define IS_BADEWANNOID(e)	(Elementeigenschaften[e] & EP_BIT_BADEWANNOID)
 #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)
@@ -120,6 +147,9 @@ typedef int BOOL;
 #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 EL_CHANGED(e)		((e)==EL_FELSBROCKEN    ? EL_EDELSTEIN :  \
 				 (e)==EL_EDELSTEIN      ? EL_DIAMANT :	  \
@@ -138,15 +168,17 @@ typedef int BOOL;
 /* Pixmaps with Xpm or X11 Bitmap files */
 #define PIX_BACK		0
 #define PIX_DOOR		1
-#define PIX_TOONS		2
-#define	PIX_BIGFONT		3
-#define PIX_SMALLFONT		4
+#define PIX_HEROES		2
+#define PIX_TOONS		3
+#define	PIX_BIGFONT		4
+#define PIX_SMALLFONT		5
 /* Pixmaps without them */
-#define PIX_DB_BACK		5
-#define PIX_DB_DOOR		6
+#define PIX_DB_BACK		6
+#define PIX_DB_DOOR		7
+#define PIX_DB_FIELD		8
 
-#define NUM_PICTURES		5
-#define NUM_PIXMAPS		7
+#define NUM_PICTURES		6
+#define NUM_PIXMAPS		9
 
 /* boundaries of arrays etc. */
 #define MAX_NAMELEN		(10+1)
@@ -165,12 +197,6 @@ typedef int BOOL;
 #define MAX_NUM_AMOEBA		100
 #define MAX_ELEMENTS		512
 
-struct PictureFile
-{
-  char *picture_filename;
-  char *picturemask_filename;
-};
-
 struct HiScore
 {
   char Name[MAX_NAMELEN];
@@ -220,9 +246,9 @@ struct RecordingInfo
   unsigned long length_seconds;
   unsigned int delay_played;
   BOOL pause_before_death;
-  BOOL changed;
   BOOL recording, playing, pausing;
   BOOL fast_forward;
+  BOOL changed;
   struct
   {
     unsigned char joystickdata;
@@ -237,14 +263,18 @@ struct JoystickInfo
 };
 
 extern Display	       *display;
+extern Visual	       *visual;
 extern int		screen;
 extern Window  		window;
-extern GC		gc, clip_gc[];
-extern XImage 	       *image[];
-extern Pixmap		clipmask[];
+extern GC		gc, clip_gc[], tile_clip_gc;
 extern Pixmap		pix[];
+extern Pixmap		clipmask[], tile_clipmask[];
+
+#ifdef XPM_INCLUDE_FILE
 extern XpmAttributes 	xpm_att[];
-extern Drawable    	drawto, drawto_field, backbuffer;
+#endif
+
+extern Drawable    	drawto, drawto_field, backbuffer, fieldbuffer;
 extern Colormap		cmap;
 
 extern int		sound_pipe[2];
@@ -254,7 +284,6 @@ extern int		joystick_device;
 extern char	       *joystick_device_name[2];
 extern char	       *level_directory;
 extern int     		width, height;
-extern unsigned long	pen_fg, pen_bg;
 
 extern int		game_status;
 extern int		game_emulation;
@@ -268,12 +297,15 @@ 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		cpu_friendly;
 
-extern BOOL		redraw[SCR_FIELDX][SCR_FIELDY];
+extern BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+extern int		redraw_x1, redraw_y1;
 extern int		redraw_mask;
 extern int		redraw_tiles;
 
@@ -294,9 +326,16 @@ extern long		Elementeigenschaften[MAX_ELEMENTS];
 extern int		level_nr, leveldir_nr, num_leveldirs;
 extern int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-extern int		LevelSolved,GameOver, JX,JY, ZX,ZY;
+extern int		FX,FY, ScreenMovPos, ScrollStepSize;
+extern int		GameSpeed, MoveSpeed;
+extern int		BX1,BY1, BX2,BY2;
+extern int		JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
+extern int		PlayerMovDir, PlayerMovPos, PlayerPushing;
+extern int		PlayerFrame, PlayerGfxPos;
+extern int		PlayerGone,LevelSolved,GameOver;
 extern int		FrameCounter,TimeFrames,TimeLeft,Score;
-extern int		Gems,SokobanFields,Lights,Dynamite,Key[4],MampferNr;
+extern int		Gems,SokobanFields,Lights,Friends;
+extern int		Dynamite,Key[4],MampferNr;
 extern int		DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
 extern int		SiebAktiv;
 
@@ -305,8 +344,10 @@ extern struct LevelInfo		level;
 extern struct PlayerInfo	player;
 extern struct HiScore		highscore[];
 extern struct RecordingInfo	tape;
+extern struct SoundInfo		Sound[];
 extern struct JoystickInfo	joystick[];
 
+extern char		*sound_name[];
 extern int		background_loop[];
 extern int		num_bg_loops;
 
@@ -332,6 +373,8 @@ extern char		*progname;
 #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
@@ -361,6 +404,7 @@ extern char		*progname;
 #define GFX_PER_LINE		16
 #define MINI_GFX_PER_LINE	32
 #define MICRO_GFX_PER_LINE	128
+#define HEROES_PER_LINE		16
 #define FONT_CHARS_PER_LINE	16
 #define FONT_LINES_PER_FONT	4
 
@@ -381,7 +425,7 @@ extern char		*progname;
 #define EL_KAEFER		9
 #define EL_FLIEGER		10
 #define EL_MAMPFER		11
-#define EL_ZOMBIE		12
+#define EL_ROBOT		12
 #define EL_BETON		13
 #define EL_DIAMANT		14
 #define EL_AMOEBE_TOT		15
@@ -487,6 +531,17 @@ extern char		*progname;
 #define EL_AUSGANG_AUF		107
 #define EL_SIEB2_TOT		108
 #define EL_AMOEBA2DIAM		109
+#define EL_MAULWURF		110
+#define EL_PINGUIN		111
+#define EL_SONDE		112
+#define EL_PFEIL_L		113
+#define EL_PFEIL_R		114
+#define EL_PFEIL_O		115
+#define EL_PFEIL_U		116
+#define EL_SCHWEIN		117
+#define EL_DRACHE		118
+
+#define EL_UNUSED_119		119
 
 #define EL_CHAR_START		120
 #define EL_CHAR_ASCII0		(EL_CHAR_START-32)
@@ -519,6 +574,10 @@ 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_UNUSED_255		255
+
 /* "unreal" runtime elements */
 #define EL_BLOCKED		300
 #define EL_EXPLODING		301
@@ -527,8 +586,25 @@ extern char		*progname;
 #define EL_BLURB_RIGHT		304
 #define EL_AMOEBING		305
 #define EL_MAUERND		306
+#define EL_BURNING		307
+#define EL_PLAYER_IS_LEAVING	308
 
-/* names for the graphic objects */
+/* game graphics:
+**	  0 - 255: graphics from "RocksScreen"
+**	256 - 511: graphics from "RocksFont"
+**	512 - 767: 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 NUM_TILES		768
+
+/* graphics from "RocksScreen" */
 /* Zeile 0 (0) */
 #define GFX_LEERRAUM		(-1)
 #define	GFX_ERDREICH		0
@@ -560,7 +636,7 @@ extern char		*progname;
 #define GFX_BADEWANNE3		32
 #define GFX_BADEWANNE4		33
 #define GFX_BADEWANNE5		34
-#define	GFX_SPIELFIGUR		35
+#define	GFX_SMILEY		35
 #define GFX_PFORTE1		36
 #define GFX_PFORTE2		37
 #define GFX_PFORTE3		38
@@ -586,7 +662,7 @@ extern char		*progname;
 #define GFX_KAEFER_U		75
 /* Zeile 5 (80) */
 #define GFX_MAMPFER		80
-#define GFX_ZOMBIE		84
+#define GFX_ROBOT		84
 #define GFX_PACMAN		88
 #define GFX_PACMAN_R		88
 #define GFX_PACMAN_O		89
@@ -608,6 +684,10 @@ extern char		*progname;
 #define GFX_BIRNE_EIN		113
 #define GFX_ZEIT_VOLL		114
 #define GFX_ZEIT_LEER		115
+#define GFX_SPIELER1		116
+#define GFX_SPIELER2		117
+#define GFX_SPIELER3		118
+#define GFX_SPIELER4		119
 #define GFX_AMOEBE_VOLL		120
 #define GFX_AMOEBE_BD		GFX_AMOEBE_VOLL
 #define GFX_SOKOBAN_OBJEKT	121
@@ -630,11 +710,14 @@ extern char		*progname;
 #define GFX_KUGEL_GELB		142
 #define GFX_KUGEL_GRAU		143
 /* Zeile 9 (144) */
-#define GFX_BLURB_LEFT		144
-#define GFX_BLURB_RIGHT		148
+#define GFX_PINGUIN		144
+#define GFX_MAULWURF		145
+#define GFX_SCHWEIN		146
+#define GFX_DRACHE		147
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
+#define GFX_SONDE		159
 /* Zeile 10 (160) */
 #define GFX_EDELSTEIN_BD	163
 #define GFX_MAUER_R1		165
@@ -669,15 +752,48 @@ extern char		*progname;
 #define GFX_FIREFLY_L		206
 #define GFX_FIREFLY_U		207
 
-#define	GFX_SCHLUESSEL		GFX_SCHLUESSEL1
-
-#define GFX_SPIELER1		116
-#define GFX_SPIELER2		117
-#define GFX_SPIELER3		118
-#define GFX_SPIELER4		119
-
-/* nicht in "RocksScreen" sondern woanders :) */
-#define GFX_CHAR_START		256
+/* CHANGE THIS!!!! (NO REGULAR POSITIONS...) */
+#define GFX_MASK_SPARKLING	210
+/* CHANGE THIS!!!! (NO REGULAR POSITIONS...) */
+
+#define GFX_SCHLUESSEL		GFX_SCHLUESSEL1
+#define GFX_SPIELFIGUR		GFX_SPIELER1
+
+
+/* graphics from "RocksHeroes" */
+
+#define GFX_SPIELER_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 0)
+#define GFX_SPIELER_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 4)
+#define GFX_SPIELER_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 0)
+#define GFX_SPIELER_RIGHT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 4)
+#define GFX_SPIELER_PUSH_RIGHT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 0)
+#define GFX_SPIELER_PUSH_LEFT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 4)
+#define GFX_SONDE_START		(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 0)
+#define GFX_SCHWEIN_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 8)
+#define GFX_SCHWEIN_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE +12)
+#define GFX_SCHWEIN_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 8)
+#define GFX_SCHWEIN_RIGHT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE +12)
+#define GFX_DRACHE_DOWN		(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 8)
+#define GFX_DRACHE_UP		(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE +12)
+#define GFX_DRACHE_LEFT		(GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE + 8)
+#define GFX_DRACHE_RIGHT	(GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE +12)
+#define GFX_MAULWURF_DOWN	(GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 8)
+#define GFX_MAULWURF_UP		(GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12)
+#define GFX_MAULWURF_LEFT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8)
+#define GFX_MAULWURF_RIGHT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12)
+#define GFX_PINGUIN_DOWN	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 8)
+#define GFX_PINGUIN_UP		(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE +12)
+#define GFX_PINGUIN_LEFT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 8)
+#define GFX_PINGUIN_RIGHT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE +12)
+#define GFX_BLURB_LEFT		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 8)
+#define GFX_BLURB_RIGHT		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE +12)
+#define GFX_FLAMMEN_LEFT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 0)
+#define GFX_FLAMMEN_RIGHT	(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 0)
+#define GFX_FLAMMEN_UP		(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 0)
+#define GFX_FLAMMEN_DOWN	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 0)
+
+/* 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)
@@ -714,7 +830,7 @@ extern char		*progname;
 #define SC_KAEFER		2
 #define SC_FLIEGER		3
 #define SC_MAMPFER		4
-#define SC_ZOMBIE		5
+#define SC_ROBOT		5
 #define SC_PACMAN		6
 #define SC_KOKOSNUSS		7
 #define SC_DYNAMIT		8
@@ -783,10 +899,7 @@ extern char		*progname;
 				 (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
 				 (s)==SND_TYGER || (s)==SND_VOYAGER || \
 				 (s)==SND_TWILIGHT)
-extern char *sound_name[NUM_SOUNDS];
 
-/* this structure contains the sound data for the sound server */
-extern struct SoundInfo Sound[NUM_SOUNDS];
 
 /* directions for moving */
 #define MV_NO_MOVING		0
@@ -822,44 +935,6 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define EMU_BOULDERDASH		1
 #define EMU_SOKOBAN		2
 
-/* values for the joystick */
-#define JOYSTICK_OFF		0
-#define	JOYSTICK_AVAILABLE	1
-#ifdef __FreeBSD__
-#include <machine/joystick.h>
-#define DEV_JOYSTICK_0		"/dev/joy0"
-#define DEV_JOYSTICK_1		"/dev/joy1"
-#else
-#define DEV_JOYSTICK_0		"/dev/js0"
-#define DEV_JOYSTICK_1		"/dev/js1"
-#endif
-
-/* get these values from the program 'js' from the joystick package, */
-/* set JOYSTICK_PERCENT to a threshold appropriate for your joystick */
-#define JOYSTICK_XLEFT		30
-#define JOYSTICK_XRIGHT		1250
-#define JOYSTICK_XMIDDLE	530
-#define JOYSTICK_YUPPER		40
-#define JOYSTICK_YLOWER		1440
-#define JOYSTICK_YMIDDLE	680
-#define JOYSTICK_PERCENT	25
-#define JOY_LEFT		MV_LEFT
-#define JOY_RIGHT		MV_RIGHT
-#define JOY_UP			MV_UP
-#define JOY_DOWN	       	MV_DOWN
-#define JOY_BUTTON_1		16
-#define JOY_BUTTON_2		32
-#define JOY_BUTTON		(JOY_BUTTON_1 | JOY_BUTTON_2)
-#define JOY_BUTTON_NOT_PRESSED	0
-#define JOY_BUTTON_PRESSED	1
-#define JOY_BUTTON_NEW_PRESSED	2
-#define JOY_BUTTON_NEW_RELEASED	3
-
-#ifdef NO_JOYSTICK
-#define JOYSTICK_STATUS		JOYSTICK_OFF
-#else
-#define JOYSTICK_STATUS		JOYSTICK_AVAILABLE
-#endif
 
 #ifndef GAME_DIR
 #define GAME_DIR		"."
@@ -887,10 +962,17 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define JOYDAT_PATH		GAME_DIR
 #endif
 
+#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 JOYDAT_FILE		JOYDAT_PATH "/" JOYDAT_FILENAME
 
@@ -917,10 +999,10 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define LEVELREC_COOKIE_LEN	(strlen(LEVELREC_COOKIE)+1)
 #define JOYSTICK_COOKIE_LEN	(strlen(JOYSTICK_COOKIE)+1)
 
-#define VERSION_STRING		"1.1"
+#define VERSION_STRING		"1.2"
 #define GAMETITLE_STRING	"Rocks'n'Diamonds"
 #define WINDOWTITLE_STRING	GAMETITLE_STRING " " VERSION_STRING
-#define COPYRIGHT_STRING	"Copyright ^1995-97 by Holger Schemel"
+#define COPYRIGHT_STRING	"Copyright ^1995-98 by Holger Schemel"
 
 /* Leerer Login- und Alias-Name */
 #define EMPTY_LOGIN		"NO_LOGIN"
@@ -932,19 +1014,21 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define MB_PRESSED		TRUE
 #define MB_MENU_CHOICE		FALSE
 #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 key_status */
 #define KEY_NOT_PRESSED		FALSE
 #define KEY_RELEASED		FALSE
 #define KEY_PRESSED		TRUE
 
-/* values for focus_status */
-#define FOCUS_OUT		FALSE
-#define FOCUS_IN		TRUE
-
 /* values for redraw_mask */
 #define REDRAW_ALL		(1L<<0)
 #define REDRAW_FIELD		(1L<<1)
@@ -954,10 +1038,11 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define REDRAW_VIDEO_2		(1L<<5)
 #define REDRAW_VIDEO_3		(1L<<6)
 #define REDRAW_MICROLEV		(1L<<7)
+#define REDRAW_FROM_BACKBUFFER	(1L<<8)
 #define REDRAW_DOOR_2	(REDRAW_VIDEO_1 | REDRAW_VIDEO_2 | REDRAW_VIDEO_3)
 #define REDRAW_DOORS	(REDRAW_DOOR_1 | REDRAW_DOOR_2)
 #define REDRAW_MAIN	(REDRAW_FIELD | REDRAW_TILES | REDRAW_MICROLEV)
-#define REDRAWTILES_TH		SCR_FIELDX*SCR_FIELDY/2
+#define REDRAWTILES_THRESHOLD	SCR_FIELDX*SCR_FIELDY/2
 
 /* positions in the game control window */
 #define XX_LEVEL		37
@@ -1003,4 +1088,9 @@ extern struct SoundInfo Sound[NUM_SOUNDS];
 #define DOOR_GFX_PAGEY1		0
 #define DOOR_GFX_PAGEY2		DYSIZE
 
+/* für DrawGraphicAnimation (tools.c) und AnimateToon (cartoons.c) */
+#define ANIM_NORMAL	0
+#define ANIM_OSCILLATE	1
+#define ANIM_REVERSE	2
+
 #endif