X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=cd6ffe2b3bd8d9f020f56221c6a802e26321c2aa;hp=07ce33fb9e3fd35499fafb42beb026a7556a3b48;hb=c0c5862d9ee59c70412b1c35e558101b109a8ec9;hpb=18f04ed2930c70cce6231148945cc24a1c662041

diff --git a/src/main.h b/src/main.h
index 07ce33fb..cd6ffe2b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -715,10 +715,17 @@
 #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]))
 
 #define IS_FREE(x, y)		(Feld[x][y] == EL_EMPTY && !IS_PLAYER(x, y))
@@ -773,6 +780,9 @@
 #define ANIM_DELAY(g)		(graphic_info[g].anim_delay)
 #define ANIM_MODE(g)		(graphic_info[g].anim_mode)
 
+#define IS_ANIM_MODE_CE(g)	(graphic_info[g].anim_mode & (ANIM_CE_VALUE |  \
+							      ANIM_CE_SCORE |  \
+							      ANIM_CE_DELAY))
 #define IS_ANIMATED(g)		(ANIM_FRAMES(g) > 1)
 #define IS_NEW_DELAY(f, g)	((f) % ANIM_DELAY(g) == 0)
 #define IS_NEW_FRAME(f, g)	(IS_ANIMATED(g) && IS_NEW_DELAY(f, g))
@@ -1311,7 +1321,26 @@
 
 #define EL_BD_EXPANDABLE_WALL		713
 
-#define NUM_FILE_ELEMENTS		714
+#define EL_LAST_CE_8			714
+#define EL_LAST_CE_7			715
+#define EL_LAST_CE_6			716
+#define EL_LAST_CE_5			717
+#define EL_LAST_CE_4			718
+#define EL_LAST_CE_3			719
+#define EL_LAST_CE_2			720
+#define EL_LAST_CE_1			721
+#define EL_SELF				722
+#define EL_NEXT_CE_1			723
+#define EL_NEXT_CE_2			724
+#define EL_NEXT_CE_3			725
+#define EL_NEXT_CE_4			726
+#define EL_NEXT_CE_5			727
+#define EL_NEXT_CE_6			728
+#define EL_NEXT_CE_7			729
+#define EL_NEXT_CE_8			730
+#define EL_ANY_ELEMENT			731
+
+#define NUM_FILE_ELEMENTS		732
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1813,6 +1842,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];
 };
@@ -1826,6 +1858,15 @@ struct DoorInfo
   int anim_mode;
 };
 
+struct PreviewInfo
+{
+  int x, y;
+  int xsize, ysize;
+  int tile_size;
+  int step_offset;
+  int step_delay;
+};
+
 struct HiScore
 {
   char Name[MAX_PLAYER_NAME_LEN + 1];
@@ -2195,20 +2236,28 @@ struct GraphicInfo
 
   int src_x, src_y;		/* start position of animation frames */
   int width, height;		/* width/height of each animation frame */
+
   int offset_x, offset_y;	/* x/y offset to next animation frame */
   int offset2_x, offset2_y;	/* x/y offset to second movement tile */
+
   boolean double_movement;	/* animation has second movement tile */
   int swap_double_tiles;	/* explicitely force or forbid tile swapping */
+
   int anim_frames;
   int anim_frames_per_line;
   int anim_start_frame;
   int anim_delay;		/* important: delay of 1 means "no delay"! */
   int anim_mode;
+
   boolean anim_global_sync;
+
   int crumbled_like;		/* element for cloning crumble graphics */
   int diggable_like;		/* element for cloning digging graphics */
+
   int border_size;		/* border size for "crumbled" graphics */
+
   int scale_up_factor;		/* optional factor for scaling image up */
+
   int clone_from;		/* graphic for cloning *all* settings */
 
   int anim_delay_fixed;		/* optional delay values for bored and   */
@@ -2298,8 +2347,9 @@ 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;
 extern Pixmap			tile_clipmask[];
 extern DrawBuffer	       *fieldbuffer;
@@ -2388,6 +2438,7 @@ extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
+extern struct PreviewInfo	preview;
 extern struct ElementInfo	element_info[];
 extern struct ElementNameInfo	element_name_info[];
 extern struct ElementActionInfo	element_action_info[];