X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=bd672e761804526e148f6ffcc0201baad76df192;hb=b3a26c7f7de58f5b86cf5069334407b4e9f8262a;hp=e111f027262d11f89b4864c911a132f254ca468e;hpb=d30adaf83e17eef0c2b186c6fd622baa506df4f0;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index e111f027..bd672e76 100644
--- a/src/main.h
+++ b/src/main.h
@@ -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
@@ -2456,6 +2458,10 @@ enum
   GFX_ARG_ACTIVE_YOFFSET,
   GFX_ARG_PRESSED_XOFFSET,
   GFX_ARG_PRESSED_YOFFSET,
+  GFX_ARG_STACKED_XFACTOR,
+  GFX_ARG_STACKED_YFACTOR,
+  GFX_ARG_STACKED_XOFFSET,
+  GFX_ARG_STACKED_YOFFSET,
 
   NUM_GFX_ARGS
 };
@@ -2595,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
@@ -2611,15 +2618,15 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		3
-#define PROGRAM_VERSION_MINOR		4
-#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_MINOR		5
+#define PROGRAM_VERSION_PATCH		2
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
 #define PROGRAM_EMAIL_STRING		"info@artsoft.org"
 #define PROGRAM_WEBSITE_STRING		"https://www.artsoft.org/"
-#define PROGRAM_COPYRIGHT_STRING	"1995-2022 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"1995-2023 by Holger Schemel"
 #define PROGRAM_COMPANY_STRING		"A Game by Artsoft Entertainment"
 
 #define PROGRAM_ICON_FILENAME		"icons/icon.png"
@@ -3304,6 +3311,8 @@ struct LevelInfo
   int num_mm_ball_contents;
   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
@@ -3690,6 +3699,11 @@ struct GraphicInfo
   int pressed_xoffset;
   int pressed_yoffset;
 
+  int stacked_xfactor;
+  int stacked_yfactor;
+  int stacked_xoffset;
+  int stacked_yoffset;
+
   boolean use_image_size;	// use image size as default width and height
 };
 
@@ -3762,7 +3776,6 @@ struct HelpAnimInfo
 
 
 extern Bitmap		       *bitmap_db_field;
-extern Bitmap		       *bitmap_db_panel;
 extern Bitmap		       *bitmap_db_door_1;
 extern Bitmap		       *bitmap_db_door_2;
 extern Bitmap		       *bitmap_db_store_1;