X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=c5939594ac7e67d827ad9d7fecb9b73cbef00ec7;hb=8f9768f67f24a3279d812ee1760e8dc8e723145d;hp=fd13bc900e05d7f0cbea9a774239ab742f973616;hpb=7344cb1d0c4fb6c05604d93fc7e99bc678c1937e;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index fd13bc90..c5939594 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,7 +86,7 @@
 #define EP_DROPPABLE		22
 #define EP_CAN_EXPLODE_1X1	23
 #define EP_PUSHABLE		24
-#define EP_CAN_EXPLODE_DYNA	25
+#define EP_CAN_EXPLODE_CROSS	25
 #define EP_PROTECTED		26
 #define EP_CAN_MOVE_INTO_ACID	27
 
@@ -324,7 +324,7 @@
 #define IS_DROPPABLE(e)		HAS_PROPERTY(e, EP_DROPPABLE)
 #define CAN_EXPLODE_1X1(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_1X1)
 #define IS_PUSHABLE(e)		HAS_PROPERTY(e, EP_PUSHABLE)
-#define CAN_EXPLODE_DYNA(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_DYNA)
+#define CAN_EXPLODE_CROSS(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_CROSS)
 #define IS_PROTECTED(e)		HAS_PROPERTY(e, EP_PROTECTED)
 #define CAN_MOVE_INTO_ACID(e)	HAS_PROPERTY(e, EP_CAN_MOVE_INTO_ACID)
 
@@ -1213,7 +1213,7 @@
 #define PROGRAM_VERSION_MAJOR	3
 #define PROGRAM_VERSION_MINOR	1
 #define PROGRAM_VERSION_PATCH	0
-#define PROGRAM_VERSION_BUILD	0
+#define PROGRAM_VERSION_BUILD	1
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1444,7 +1444,9 @@ struct LevelInfo
   boolean block_last_field;	/* player blocks previous field while moving */
   boolean sp_block_last_field;	/* player blocks previous field while moving */
   boolean use_spring_bug;	/* for compatibility with old levels */
+  boolean instant_relocation;	/* no visual delay when relocating player */
 
+  /* ('int' instead of 'boolean' because used as selectbox value in editor) */
   int use_step_counter;		/* count steps instead of seconds for level */
 
   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1562,14 +1564,14 @@ struct ElementChangeInfo
 
   boolean explode;		/* explode instead of change */
 
+  /* ---------- internal values used at runtime when playing ---------- */
+
   /* functions that are called before, while and after the change of an
      element -- currently only used for non-custom elements */
   void (*pre_change_function)(int x, int y);
   void (*change_function)(int x, int y);
   void (*post_change_function)(int x, int y);
 
-  /* ---------- internal values used at runtime when playing ---------- */
-
   short actual_trigger_element;	/* element that actually triggered change */
   int actual_trigger_player;	/* player which actually triggered change */