X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=a88e12b8b3ea1c4f4773be6ae487255f6a44d7d3;hb=ac86d841daa4ecafff3128110a1db109e03fb355;hp=1254d9f2ba8116f6e763f37d3bd3d63924963110;hpb=f7704e2d22e9499efe6380e0c916c2bd4918e4be;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 1254d9f2..a88e12b8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -177,11 +177,7 @@
 #define EP_BITMASK_DEFAULT		0
 
 #define PROPERTY_BIT(p)			(1 << ((p) % 32))
-#if 1
 #define PROPERTY_VAR(e,p)		(element_info[e].properties[(p) / 32])
-#else
-#define PROPERTY_VAR(e,p)		(Properties[e][(p) / 32])
-#endif
 #define HAS_PROPERTY(e,p)	((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0)
 #define SET_PROPERTY(e,p,v)	((v) ?					   \
 				 (PROPERTY_VAR(e,p) |=  PROPERTY_BIT(p)) : \
@@ -710,21 +706,13 @@
 #define SND_ELEMENT(e)		(e)
 #endif
 
-#if 1
 #define GROUP_NR(e)		((e) - EL_GROUP_START)
 #define IS_IN_GROUP(e, nr)	(element_info[e].in_group[nr] == TRUE)
 #define IS_IN_GROUP_EL(e, ge)	(IS_IN_GROUP(e, (ge) - EL_GROUP_START))
 
-#if 1
 #define IS_EQUAL_OR_IN_GROUP(e, ge)					\
 	(ge == EL_ANY_ELEMENT ? TRUE :					\
 	 IS_GROUP_ELEMENT(ge) ? IS_IN_GROUP(e, GROUP_NR(ge)) : (e) == (ge))
-#else
-#define IS_EQUAL_OR_IN_GROUP(e, ge)					\
-	(IS_GROUP_ELEMENT(ge) ? IS_IN_GROUP(e, GROUP_NR(ge)) : (e) == (ge))
-#endif
-
-#endif
 
 #define IS_PLAYER(x, y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
@@ -806,10 +794,6 @@
 #define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
 #define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
 
-/* values for fading in and out */
-#define TITLE_SCREEN_FADE_DELAY		250
-#define TITLE_SCREEN_POST_DELAY		(TITLE_SCREEN_FADE_DELAY / 2)
-
 /* boundaries of arrays etc. */
 #define MAX_LEVEL_NAME_LEN	32
 #define MAX_LEVEL_AUTHOR_LEN	32
@@ -820,12 +804,6 @@
 
 #define MAX_NUM_AMOEBA		100
 
-#if 0	/* game.h */
-#define MAX_INVENTORY_SIZE	1000
-#define STD_NUM_KEYS		4
-#define MAX_NUM_KEYS		8
-#endif
-
 #define NUM_BELTS		4
 #define NUM_BELT_PARTS		3
 #define NUM_ENVELOPES		4
@@ -1749,7 +1727,7 @@
 /* program information and versioning definitions */
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
-#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_PATCH		2
 #define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -1846,6 +1824,9 @@ struct MenuInfo
 
   int list_size[NUM_SPECIAL_GFX_ARGS];
 
+  int fade_delay;
+  int post_delay;
+
   int sound[NUM_SPECIAL_GFX_ARGS];
   int music[NUM_SPECIAL_GFX_ARGS];
 };
@@ -1969,7 +1950,6 @@ struct LevelInfo
   int explosion_element[MAX_PLAYERS];
   boolean use_explosion_element[MAX_PLAYERS];
 
-#if 1
   /* values for the new EMC elements */
   int android_move_time;
   int android_clone_time;
@@ -1986,12 +1966,8 @@ struct LevelInfo
   struct Content ball_content[MAX_ELEMENT_CONTENTS];
   int num_ball_contents;
 
-#if 0
-  boolean android_array[16];
-#endif
   int num_android_clone_elements;
   int android_clone_element[MAX_ANDROID_ELEMENTS];
-#endif
 
   int can_move_into_acid_bits;	/* bitfield to store property for elements */
   int dont_collide_with_bits;	/* bitfield to store property for elements */
@@ -2348,7 +2324,7 @@ struct HelpAnimInfo
 };
 
 
-extern Bitmap		       *bitmap_db_title;
+extern Bitmap		       *bitmap_db_cross;
 extern Bitmap		       *bitmap_db_field;
 extern Bitmap		       *bitmap_db_panel;
 extern Bitmap		       *bitmap_db_door;
@@ -2397,10 +2373,6 @@ extern short			ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
-#if 0
-extern unsigned long		Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
-#endif
-
 extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -2425,8 +2397,6 @@ extern int			ExitX, ExitY;
 extern int			AllPlayersGone;
 
 extern int			TimeFrames, TimePlayed, TimeLeft, TapeTime;
-extern boolean			SiebAktiv;
-extern int			SiebCount;
 
 extern boolean			network_player_action_received;