X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=ae2aa5d0e5df5aba5b23e00bf499c4d5653aa0d7;hb=0ae305660baec1a7568ac7df7f296b695904d59a;hp=64cd7bdcf44b7210aca3f4fa88d57ae36a1b6fa5;hpb=c77e984eb41ae3473b474e9051b0a71afffeb73c;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 64cd7bdc..ae2aa5d0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -135,13 +135,14 @@
 #define EP_CAN_SMASH		69
 #define EP_CAN_EXPLODE		70
 #define EP_CAN_EXPLODE_3X3	71
+#define EP_SP_PORT		72
 
 /* values for internal purpose only (level editor) */
-#define EP_EXPLODE_RESULT	72
-#define EP_WALK_TO_OBJECT	73
-#define EP_DEADLY		74
+#define EP_EXPLODE_RESULT	73
+#define EP_WALK_TO_OBJECT	74
+#define EP_DEADLY		75
 
-#define NUM_ELEMENT_PROPERTIES	75
+#define NUM_ELEMENT_PROPERTIES	76
 
 #define NUM_EP_BITFIELDS	((NUM_ELEMENT_PROPERTIES + 31) / 32)
 #define EP_BITFIELD_BASE	0
@@ -259,6 +260,10 @@
 #define MV_TURNING_RANDOM	(1 << MV_BIT_TURNING_RANDOM)
 #define MV_PREVIOUS		(1 << MV_BIT_PREVIOUS)
 
+/* values for elements left behind by custom elements */
+#define LEAVE_TYPE_UNLIMITED	0
+#define LEAVE_TYPE_LIMITED	1
+
 /* values for slippery property for custom elements */
 #define SLIPPERY_ANY_RANDOM	0
 #define SLIPPERY_ANY_LEFT_RIGHT	1
@@ -341,6 +346,7 @@
 #define CAN_SMASH(e)		HAS_PROPERTY(e, EP_CAN_SMASH)
 #define CAN_EXPLODE(e)		HAS_PROPERTY(e, EP_CAN_EXPLODE)
 #define CAN_EXPLODE_3X3(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_3X3)
+#define IS_SP_PORT(e)		HAS_PROPERTY(e, EP_SP_PORT)
 
 /* special macros used in game engine */
 #define IS_CUSTOM_ELEMENT(e)	((e) >= EL_CUSTOM_START &&		\
@@ -906,12 +912,16 @@
 #define EL_EXPANDABLE_WALL_GROWING	(EL_FIRST_RUNTIME_UNREAL + 8)
 #define EL_FLAMES			(EL_FIRST_RUNTIME_UNREAL + 9)
 #define EL_PLAYER_IS_LEAVING		(EL_FIRST_RUNTIME_UNREAL + 10)
-#define EL_QUICKSAND_FILLING		(EL_FIRST_RUNTIME_UNREAL + 11)
-#define EL_MAGIC_WALL_FILLING		(EL_FIRST_RUNTIME_UNREAL + 12)
-#define EL_BD_MAGIC_WALL_FILLING	(EL_FIRST_RUNTIME_UNREAL + 13)
+#define EL_PLAYER_IS_EXPLODING_1	(EL_FIRST_RUNTIME_UNREAL + 11)
+#define EL_PLAYER_IS_EXPLODING_2	(EL_FIRST_RUNTIME_UNREAL + 12)
+#define EL_PLAYER_IS_EXPLODING_3	(EL_FIRST_RUNTIME_UNREAL + 13)
+#define EL_PLAYER_IS_EXPLODING_4	(EL_FIRST_RUNTIME_UNREAL + 14)
+#define EL_QUICKSAND_FILLING		(EL_FIRST_RUNTIME_UNREAL + 15)
+#define EL_MAGIC_WALL_FILLING		(EL_FIRST_RUNTIME_UNREAL + 16)
+#define EL_BD_MAGIC_WALL_FILLING	(EL_FIRST_RUNTIME_UNREAL + 17)
 
 /* dummy elements (never used as game elements, only used as graphics) */
-#define EL_FIRST_DUMMY			(EL_FIRST_RUNTIME_UNREAL + 14)
+#define EL_FIRST_DUMMY			(EL_FIRST_RUNTIME_UNREAL + 18)
 
 #define EL_STEELWALL_TOPLEFT			(EL_FIRST_DUMMY + 0)
 #define EL_STEELWALL_TOPRIGHT			(EL_FIRST_DUMMY + 1)
@@ -1314,6 +1324,8 @@ struct LevelFileInfo
 {
   int nr;
   int type;
+  boolean packed;
+  char *basename;
   char *filename;
 };
 
@@ -1473,12 +1485,16 @@ struct ElementGroupInfo
   int num_elements;			/* number of elements in this group */
   short element[MAX_ELEMENTS_IN_GROUP];	/* list of elements in this group */
 
+  int choice_mode;		/* how to choose element from group */
+
   /* ---------- internal values used at runtime when playing ---------- */
 
   /* the following is the same as above, but with recursively resolved group
      elements (group elements may also contain further group elements!) */
   int num_elements_resolved;
   short element_resolved[NUM_FILE_ELEMENTS];
+
+  int choice_pos;		/* current element choice position */
 };
 
 struct ElementInfo
@@ -1524,6 +1540,7 @@ struct ElementInfo
   int move_stepsize;		/* step size element moves with */
   int move_enter_element;	/* element that can be entered (and removed) */
   int move_leave_element;	/* element that can be left behind */
+  int move_leave_type;		/* change (limited) or leave (unlimited) */
 
   int slippery_type;		/* how/where other elements slip away */
 
@@ -1546,6 +1563,9 @@ struct ElementInfo
 
   boolean in_group[NUM_GROUP_ELEMENTS];
 
+  boolean can_leave_element;	/* element can leave other element behind */
+  boolean can_leave_element_last;
+
   /* ---------- internal values used in level editor ---------- */
 
   int access_type;		/* walkable or passable */