X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=a6ec11b09f33d9781cd1d6c31dc7d623d579b0e1;hb=c42db18f39053cf2ec85943c37a20b8caa742d09;hp=188f00b3dea4c07fd95817a094dcd65cd9f8289e;hpb=a1658d14b0ff3ddb46cc075aba1dddf7d01c6442;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 188f00b3..a6ec11b0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -201,9 +201,9 @@
 #define EP_BITMASK_DEFAULT		0
 
 #define PROPERTY_BIT(p)			(1u << ((p) % 32))
-#define PROPERTY_VAR(e,p)		(element_info[e].properties[(p) / 32])
-#define HAS_PROPERTY(e,p)	((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0)
-#define SET_PROPERTY(e,p,v)	((v) ?					   \
+#define PROPERTY_VAR(e, p)		(element_info[e].properties[(p) / 32])
+#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)) : \
 				 (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p)))
 
@@ -273,19 +273,19 @@
 #define CH_EVENT_BITFIELD_NR(e)		(e / 32)
 #define CH_EVENT_BIT(e)			(1 << ((e) % 32))
 
-#define CH_EVENT_VAR(e,c)		(element_info[e].change->has_event[c])
-#define CH_ANY_EVENT_VAR(e,c)		(element_info[e].has_change_event[c])
+#define CH_EVENT_VAR(e, c)		(element_info[e].change->has_event[c])
+#define CH_ANY_EVENT_VAR(e, c)		(element_info[e].has_change_event[c])
 
-#define PAGE_HAS_CHANGE_EVENT(p,c)	((p)->has_event[c])
-#define HAS_CHANGE_EVENT(e,c)		(IS_CUSTOM_ELEMENT(e) &&	\
-					 CH_EVENT_VAR(e,c))
-#define HAS_ANY_CHANGE_EVENT(e,c)	(IS_CUSTOM_ELEMENT(e) &&	\
-					 CH_ANY_EVENT_VAR(e,c))
+#define PAGE_HAS_CHANGE_EVENT(p, c)	((p)->has_event[c])
+#define HAS_CHANGE_EVENT(e, c)		(IS_CUSTOM_ELEMENT(e) &&	\
+					 CH_EVENT_VAR(e, c))
+#define HAS_ANY_CHANGE_EVENT(e, c)	(IS_CUSTOM_ELEMENT(e) &&	\
+					 CH_ANY_EVENT_VAR(e, c))
 
-#define SET_CHANGE_EVENT(e,c,v)		(IS_CUSTOM_ELEMENT(e) ?		\
-					 CH_EVENT_VAR(e,c) = (v) : 0)
-#define SET_ANY_CHANGE_EVENT(e,c,v)	(IS_CUSTOM_ELEMENT(e) ?		\
-					 CH_ANY_EVENT_VAR(e,c) = (v) : 0)
+#define SET_CHANGE_EVENT(e, c, v)	(IS_CUSTOM_ELEMENT(e) ?		\
+					 CH_EVENT_VAR(e, c) = (v) : 0)
+#define SET_ANY_CHANGE_EVENT(e, c, v)	(IS_CUSTOM_ELEMENT(e) ?		\
+					 CH_ANY_EVENT_VAR(e, c) = (v) : 0)
 
 // values for player bitmasks
 #define PLAYER_BITS_NONE		0
@@ -871,9 +871,9 @@
 #define IS_FREE(x, y)		(Tile[x][y] == EL_EMPTY && !IS_PLAYER(x, y))
 #define IS_FREE_OR_PLAYER(x, y)	(Tile[x][y] == EL_EMPTY)
 
-#define IS_MOVING(x,y)		(MovPos[x][y] != 0)
-#define IS_FALLING(x,y)		(MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
-#define IS_BLOCKED(x,y)		(Tile[x][y] == EL_BLOCKED)
+#define IS_MOVING(x, y)		(MovPos[x][y] != 0)
+#define IS_FALLING(x, y)	(MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
+#define IS_BLOCKED(x, y)	(Tile[x][y] == EL_BLOCKED)
 
 #define IS_MV_DIAGONAL(x)	((x) & MV_HORIZONTAL && (x) & MV_VERTICAL)
 
@@ -901,13 +901,13 @@
 #define TAPE_IS_EMPTY(x)	((x).length == 0)
 #define TAPE_IS_STOPPED(x)	(!(x).recording && !(x).playing)
 
-#define PLAYERINFO(x,y)		(&stored_player[StorePlayer[x][y]-EL_PLAYER_1])
+#define PLAYERINFO(x, y)	(&stored_player[StorePlayer[x][y] - EL_PLAYER_1])
 #define SHIELD_ON(p)		((p)->shield_normal_time_left > 0)
 
-#define ENEMY_PROTECTED_FIELD(x,y)	(IS_PROTECTED(Tile[x][y]) ||       \
+#define ENEMY_PROTECTED_FIELD(x, y)	(IS_PROTECTED(Tile[x][y]) ||       \
 					 IS_PROTECTED(Back[x][y]))
-#define EXPLOSION_PROTECTED_FIELD(x,y)  (IS_EXPLOSION_PROOF(Tile[x][y]))
-#define PLAYER_ENEMY_PROTECTED(x,y)     (SHIELD_ON(PLAYERINFO(x, y)) ||	   \
+#define EXPLOSION_PROTECTED_FIELD(x, y)	(IS_EXPLOSION_PROOF(Tile[x][y]))
+#define PLAYER_ENEMY_PROTECTED(x, y)	(SHIELD_ON(PLAYERINFO(x, y)) ||	   \
 					 ENEMY_PROTECTED_FIELD(x, y))
 #define PLAYER_EXPLOSION_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) ||	   \
 					 EXPLOSION_PROTECTED_FIELD(x, y))
@@ -918,7 +918,7 @@
 #define PLAYER_DROPPING(p,x,y)	((p)->is_dropping &&			\
 				 (p)->drop_x == (x) && (p)->drop_y == (y))
 
-#define PLAYER_NR_GFX(g,i)	((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
+#define PLAYER_NR_GFX(g, i)	((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
 
 #define GET_PLAYER_ELEMENT(e)	((e) >= EL_PLAYER_1 && (e) <= EL_PLAYER_4 ? \
 				 (e) : EL_PLAYER_1)
@@ -2027,17 +2027,18 @@
 #define EL_EMC_SPRING_BUMPER_ACTIVE	(EL_FIRST_RUNTIME_REAL + 71)
 #define EL_MM_EXIT_OPENING		(EL_FIRST_RUNTIME_REAL + 72)
 #define EL_MM_EXIT_CLOSING		(EL_FIRST_RUNTIME_REAL + 73)
-#define EL_MM_GRAY_BALL_OPENING		(EL_FIRST_RUNTIME_REAL + 74)
-#define EL_MM_ICE_WALL_SHRINKING	(EL_FIRST_RUNTIME_REAL + 75)
-#define EL_MM_AMOEBA_WALL_GROWING	(EL_FIRST_RUNTIME_REAL + 76)
-#define EL_MM_PACMAN_EATING_RIGHT	(EL_FIRST_RUNTIME_REAL + 77)
-#define EL_MM_PACMAN_EATING_UP		(EL_FIRST_RUNTIME_REAL + 78)
-#define EL_MM_PACMAN_EATING_LEFT	(EL_FIRST_RUNTIME_REAL + 79)
-#define EL_MM_PACMAN_EATING_DOWN	(EL_FIRST_RUNTIME_REAL + 80)
-#define EL_MM_BOMB_ACTIVE		(EL_FIRST_RUNTIME_REAL + 81)
-#define EL_DF_MINE_ACTIVE		(EL_FIRST_RUNTIME_REAL + 82)
-
-#define NUM_DRAWABLE_ELEMENTS		(EL_FIRST_RUNTIME_REAL + 83)
+#define EL_MM_GRAY_BALL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 74)
+#define EL_MM_GRAY_BALL_OPENING		(EL_FIRST_RUNTIME_REAL + 75)
+#define EL_MM_ICE_WALL_SHRINKING	(EL_FIRST_RUNTIME_REAL + 76)
+#define EL_MM_AMOEBA_WALL_GROWING	(EL_FIRST_RUNTIME_REAL + 77)
+#define EL_MM_PACMAN_EATING_RIGHT	(EL_FIRST_RUNTIME_REAL + 78)
+#define EL_MM_PACMAN_EATING_UP		(EL_FIRST_RUNTIME_REAL + 79)
+#define EL_MM_PACMAN_EATING_LEFT	(EL_FIRST_RUNTIME_REAL + 80)
+#define EL_MM_PACMAN_EATING_DOWN	(EL_FIRST_RUNTIME_REAL + 81)
+#define EL_MM_BOMB_ACTIVE		(EL_FIRST_RUNTIME_REAL + 82)
+#define EL_DF_MINE_ACTIVE		(EL_FIRST_RUNTIME_REAL + 83)
+
+#define NUM_DRAWABLE_ELEMENTS		(EL_FIRST_RUNTIME_REAL + 84)
 
 #define EL_MM_RUNTIME_START		EL_MM_EXIT_OPENING
 #define EL_MM_RUNTIME_END		EL_MM_AMOEBA_WALL_GROWING
@@ -2340,6 +2341,7 @@ enum
   GFX_SPECIAL_ARG_SCORESNEW,
   GFX_SPECIAL_ARG_NO_TITLE,
   GFX_SPECIAL_ARG_FADING,
+  GFX_SPECIAL_ARG_RESTARTING,
   GFX_SPECIAL_ARG_QUIT,
 
   NUM_SPECIAL_GFX_ARGS
@@ -2599,6 +2601,7 @@ enum
 #define GAME_MODE_PSEUDO_SCORESNEW	GFX_SPECIAL_ARG_SCORESNEW
 #define GAME_MODE_PSEUDO_NO_TITLE	GFX_SPECIAL_ARG_NO_TITLE
 #define GAME_MODE_PSEUDO_FADING		GFX_SPECIAL_ARG_FADING
+#define GAME_MODE_PSEUDO_RESTARTING	GFX_SPECIAL_ARG_RESTARTING
 #define GAME_MODE_QUIT			GFX_SPECIAL_ARG_QUIT
 
 #define NUM_GAME_MODES			NUM_SPECIAL_GFX_ARGS
@@ -2616,7 +2619,7 @@ enum
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		5
-#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_PATCH		3
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2880,10 +2883,13 @@ struct MenuInfo
 
   int list_size[NUM_SPECIAL_GFX_ARGS];
   int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int list_entry_size_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int tile_size_info[NUM_SPECIAL_GFX_INFO_ARGS];
 
   int left_spacing[NUM_SPECIAL_GFX_ARGS];
   int left_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
   int left_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int middle_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
   int right_spacing[NUM_SPECIAL_GFX_ARGS];
   int right_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
   int right_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
@@ -3309,6 +3315,7 @@ struct LevelInfo
   int mm_ball_choice_mode;
   int mm_ball_content[MAX_MM_BALL_CONTENTS];
   boolean rotate_mm_ball_content;
+  boolean explode_mm_ball;
 
   // ('int' instead of 'boolean' because used as selectbox value in editor)
   int use_step_counter;		// count steps instead of seconds for level