X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4385aa55db7d6f3f858355c8473ebb05697eae74;hb=c9bb6e0a6eecbf84320be79b121bd957a938a08c;hp=ec1f8f6de202d5a48f4030e35d355d7c8e053b23;hpb=76fcd443cdb6744e9113b9c648ca5fc2546da848;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index ec1f8f6d..4385aa55 100644
--- a/src/main.h
+++ b/src/main.h
@@ -33,6 +33,7 @@
 #define IMG_UNDEFINED		(-1)
 #define IMG_EMPTY		IMG_EMPTY_SPACE
 #define IMG_SP_EMPTY		IMG_SP_EMPTY_SPACE
+#define IMG_EXPLOSION		IMG_DEFAULT_EXPLODING
 #define IMG_CHAR_START		IMG_CHAR_SPACE
 #define IMG_CUSTOM_START	IMG_CUSTOM_1
 
@@ -155,13 +156,22 @@
 
 /* values for change events for custom elements */
 #define CE_DELAY		0
-#define CE_PRESSED_BY_PLAYER	1
-#define CE_TOUCHED_BY_PLAYER	2
+#define CE_TOUCHED_BY_PLAYER	1
+#define CE_PRESSED_BY_PLAYER	2
+#define CE_PUSHED_BY_PLAYER	3
+#define CE_IMPACT		4
+#define CE_SMASHED		5
+#define CE_OTHER_COLLECTING	6
+#define CE_OTHER_PUSHING	7
+#define CE_OTHER_CHANGING	8
+#define CE_OTHER_EXPLODING	9
 
 /* values for internal purpose only (level editor) */
-#define CE_BY_PLAYER		3
+#define CE_BY_PLAYER		10
+#define CE_IMPACT_SMASHED	11
+#define CE_BY_OTHER		12
 
-#define NUM_CHANGE_EVENTS	4
+#define NUM_CHANGE_EVENTS	13
 
 #define CE_BITMASK_DEFAULT	0
 
@@ -749,19 +759,20 @@
 #define EL_BLOCKED			(EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION			(EL_FIRST_RUNTIME_UNREAL + 1)
 #define EL_NUT_BREAKING			(EL_FIRST_RUNTIME_UNREAL + 2)
-#define EL_ACID_SPLASH_LEFT		(EL_FIRST_RUNTIME_UNREAL + 3)
-#define EL_ACID_SPLASH_RIGHT		(EL_FIRST_RUNTIME_UNREAL + 4)
-#define EL_AMOEBA_GROWING		(EL_FIRST_RUNTIME_UNREAL + 5)
-#define EL_AMOEBA_SHRINKING		(EL_FIRST_RUNTIME_UNREAL + 6)
-#define EL_EXPANDABLE_WALL_GROWING	(EL_FIRST_RUNTIME_UNREAL + 7)
-#define EL_FLAMES			(EL_FIRST_RUNTIME_UNREAL + 8)
-#define EL_PLAYER_IS_LEAVING		(EL_FIRST_RUNTIME_UNREAL + 9)
-#define EL_QUICKSAND_FILLING		(EL_FIRST_RUNTIME_UNREAL + 10)
-#define EL_MAGIC_WALL_FILLING		(EL_FIRST_RUNTIME_UNREAL + 11)
-#define EL_BD_MAGIC_WALL_FILLING	(EL_FIRST_RUNTIME_UNREAL + 12)
+#define EL_DIAMOND_BREAKING		(EL_FIRST_RUNTIME_UNREAL + 3)
+#define EL_ACID_SPLASH_LEFT		(EL_FIRST_RUNTIME_UNREAL + 4)
+#define EL_ACID_SPLASH_RIGHT		(EL_FIRST_RUNTIME_UNREAL + 5)
+#define EL_AMOEBA_GROWING		(EL_FIRST_RUNTIME_UNREAL + 6)
+#define EL_AMOEBA_SHRINKING		(EL_FIRST_RUNTIME_UNREAL + 7)
+#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)
 
 /* dummy elements (never used as game elements, only used as graphics) */
-#define EL_FIRST_DUMMY			(EL_FIRST_RUNTIME_UNREAL + 13)
+#define EL_FIRST_DUMMY			(EL_FIRST_RUNTIME_UNREAL + 14)
 
 #define EL_STEELWALL_TOPLEFT			(EL_FIRST_DUMMY + 0)
 #define EL_STEELWALL_TOPRIGHT			(EL_FIRST_DUMMY + 1)
@@ -779,8 +790,12 @@
 #define EL_DYNABOMB_ACTIVE			(EL_FIRST_DUMMY + 13)
 #define EL_SHIELD_NORMAL_ACTIVE			(EL_FIRST_DUMMY + 14)
 #define EL_SHIELD_DEADLY_ACTIVE			(EL_FIRST_DUMMY + 15)
+#define EL_DEFAULT				(EL_FIRST_DUMMY + 16)
+#define EL_BD_DEFAULT				(EL_FIRST_DUMMY + 17)
+#define EL_SP_DEFAULT				(EL_FIRST_DUMMY + 18)
+#define EL_SB_DEFAULT				(EL_FIRST_DUMMY + 19)
 
-#define MAX_NUM_ELEMENTS			(EL_FIRST_DUMMY + 16)
+#define MAX_NUM_ELEMENTS			(EL_FIRST_DUMMY + 20)
 
 
 /* values for graphics/sounds action types */
@@ -1135,6 +1150,9 @@ struct MenuInfo
   int draw_yoffset_default;
   int draw_xoffset[NUM_SPECIAL_GFX_ARGS];
   int draw_yoffset[NUM_SPECIAL_GFX_ARGS];
+
+  int list_size_default;
+  int list_size[NUM_SPECIAL_GFX_ARGS];
 };
 
 struct DoorInfo
@@ -1151,6 +1169,8 @@ struct ElementChangeInfo
   int delay_random;		/* added frame delay before changed (random) */
   int delay_frames;		/* either 1 (frames) or 50 (seconds; 50 fps) */
 
+  short trigger;		/* custom element triggering change */
+
   short successor;		/* new custom element after change */
 };
 
@@ -1279,6 +1299,7 @@ extern short			Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short			ChangeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];