X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f25cd826b9a7555d0dfa8aae731237a7bdf3345e;hb=c4e1a476135ce36417cdd797481feeaaff4301af;hp=fdad7a4e858a621557c8b886125788d912a0dabe;hpb=998be01ad92a672b69b11e24d472f6c0c076817f;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index fdad7a4e..f25cd826 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,14 +1,14 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2000 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  main.h                                                  *
+* main.h                                                   *
 ***********************************************************/
 
 #ifndef MAIN_H
@@ -24,15 +24,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef DEBUG
-#define DEBUG_TIMING	0
-#endif
-
 #include "libgame/libgame.h"
 
 #define WIN_XSIZE	672
 #define WIN_YSIZE	560
-#define WIN_SDL_DEPTH	16	/* !!! change this !!! */
 
 #if !defined(PLATFORM_MSDOS)
 #define WIN_XPOS	0
@@ -386,9 +381,10 @@ struct GlobalInfo
 };
 
 extern GC		tile_clip_gc;
-extern Bitmap		pix[];
+extern Bitmap	       *pix[];
 extern Pixmap		tile_clipmask[];
-extern DrawBuffer	drawto_field, fieldbuffer;
+extern DrawBuffer      *fieldbuffer;
+extern DrawBuffer      *drawto_field;
 
 extern int		joystick_device;
 extern char	       *joystick_device_name[];
@@ -1426,70 +1422,63 @@ extern int		num_element_info;
 
 
 /* the names of the sounds */
-#define SND_ALCHEMY		0
-#define SND_AMOEBE		1
-#define SND_ANTIGRAV		2
-#define SND_AUTSCH		3
-#define SND_BLURB		4
-#define SND_BONG		5
-#define SND_BUING		6
-#define SND_CHASE		7
-#define SND_CZARDASZ		8
-#define SND_DENG		9
-#define SND_FUEL		10
-#define SND_GONG		11
-#define SND_HALLOFFAME		12
-#define SND_HOLZ		13
-#define SND_HUI			14
-#define SND_KABUMM		15
-#define SND_KINK		16
-#define SND_KLAPPER		17
-#define SND_KLING		18
-#define SND_KLOPF		19
-#define SND_KLUMPF		20
-#define SND_KNACK		21
-#define SND_KNURK		22
-#define SND_KRACH		23
-#define SND_LACHEN		24
-#define SND_LASER		25
-#define SND_MIEP		26
-#define SND_NETWORK		27
-#define SND_NJAM		28
-#define SND_OEFFNEN		29
-#define SND_PLING		30
-#define SND_PONG		31
-#define SND_PUSCH		32
-#define SND_QUIEK		33
-#define SND_QUIRK		34
-#define SND_RHYTHMLOOP		35
-#define SND_ROAAAR		36
-#define SND_ROEHR		37
-#define SND_RUMMS		38
-#define SND_SCHLOPP		39
-#define SND_SCHLURF		40
-#define SND_SCHRFF		41
-#define SND_SCHWIRR		42
-#define SND_SIRR		43
-#define SND_SLURP		44
-#define SND_SPROING		45
-#define SND_TWILIGHT		46
-#define SND_TYGER		47
-#define SND_VOYAGER		48
-#define SND_WARNTON		49
-#define SND_WHOOSH		50
-#define SND_ZISCH		51
-#define SND_SP_BASE		52
-#define SND_SP_INFOTRON		53
-#define SND_SP_ZONKDOWN		54
-#define SND_SP_ZONKPUSH		55
-#define SND_SP_BUG		56
-#define SND_SP_BOOM		57
-#define SND_SP_BOOOM		58
-#define SND_SP_EXIT		59
-#define SND_EMPTY		60
-#define SND_GATE		61
-
-#define NUM_SOUNDS		62
+#define SND_AMOEBE		0
+#define SND_ANTIGRAV		1
+#define SND_AUTSCH		2
+#define SND_BLURB		3
+#define SND_BONG		4
+#define SND_BUING		5
+#define SND_DENG		6
+#define SND_FUEL		7
+#define SND_GONG		8
+#define SND_HALLOFFAME		9
+#define SND_HOLZ		10
+#define SND_HUI			11
+#define SND_KABUMM		12
+#define SND_KINK		13
+#define SND_KLAPPER		14
+#define SND_KLING		15
+#define SND_KLOPF		16
+#define SND_KLUMPF		17
+#define SND_KNACK		18
+#define SND_KNURK		19
+#define SND_KRACH		20
+#define SND_LACHEN		21
+#define SND_LASER		22
+#define SND_MIEP		23
+#define SND_NJAM		24
+#define SND_OEFFNEN		25
+#define SND_PLING		26
+#define SND_PONG		27
+#define SND_PUSCH		28
+#define SND_QUIEK		29
+#define SND_QUIRK		30
+#define SND_RHYTHMLOOP		31
+#define SND_ROAAAR		32
+#define SND_ROEHR		33
+#define SND_RUMMS		34
+#define SND_SCHLOPP		35
+#define SND_SCHLURF		36
+#define SND_SCHRFF		37
+#define SND_SCHWIRR		38
+#define SND_SIRR		39
+#define SND_SLURP		40
+#define SND_SPROING		41
+#define SND_WARNTON		42
+#define SND_WHOOSH		43
+#define SND_ZISCH		44
+#define SND_SP_BASE		45
+#define SND_SP_INFOTRON		46
+#define SND_SP_ZONKDOWN		47
+#define SND_SP_ZONKPUSH		48
+#define SND_SP_BUG		49
+#define SND_SP_BOOM		50
+#define SND_SP_BOOOM		51
+#define SND_SP_EXIT		52
+#define SND_EMPTY		53
+#define SND_GATE		54
+
+#define NUM_SOUNDS		55
 
 /* default input keys */
 #define DEFAULT_KEY_LEFT	KSYM_Left