X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=55aba3704c92e06377875d6604db34dd7256816d;hb=f8f691137746b187cca2f997604a2336882b5cd9;hp=7f6e8c6c40cb91f72a3591954a4384dc1fc154a6;hpb=6b702ffdb8025ef5538c2607131ecae2874730c4;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 7f6e8c6c..55aba370 100644
--- a/src/main.h
+++ b/src/main.h
@@ -179,34 +179,52 @@
 #define CE_HITTING_SOMETHING	5
 #define CE_IMPACT		6
 #define CE_SMASHED		7
-#define CE_OTHER_IS_TOUCHING	8
-#define CE_OTHER_IS_CHANGING	9
-#define CE_OTHER_IS_EXPLODING	10
-#define CE_OTHER_GETS_TOUCHED	11
-#define CE_OTHER_GETS_PRESSED	12
-#define CE_OTHER_GETS_PUSHED	13
-#define CE_OTHER_GETS_COLLECTED	14
-#define CE_OTHER_GETS_DROPPED	15
+#define CE_TOUCHING_X		8
+#define CE_CHANGE_OF_X		9
+#define CE_EXPLOSION_OF_X	10
+#define CE_PLAYER_TOUCHES_X	11
+#define CE_PLAYER_PRESSES_X	12
+#define CE_PLAYER_PUSHES_X	13
+#define CE_PLAYER_COLLECTS_X	14
+#define CE_PLAYER_DROPS_X	15
 #define CE_BY_PLAYER_OBSOLETE	16	/* obsolete; now CE_BY_DIRECT_ACTION */
 #define CE_BY_COLLISION_OBSOLETE 17	/* obsolete; now CE_BY_DIRECT_ACTION */
 #define CE_BY_OTHER_ACTION	18	/* activates other element events */
 #define CE_BY_DIRECT_ACTION	19	/* activates direct element events */
-#define CE_OTHER_GETS_DIGGED	20
+#define CE_PLAYER_DIGS_X	20
 #define CE_ENTERED_BY_PLAYER	21
 #define CE_LEFT_BY_PLAYER	22
-#define CE_OTHER_GETS_ENTERED	23
-#define CE_OTHER_GETS_LEFT	24
+#define CE_PLAYER_ENTERS_X	23
+#define CE_PLAYER_LEAVES_X	24
 #define CE_SWITCHED		25
-#define CE_OTHER_IS_SWITCHING	26
+#define CE_SWITCH_OF_X		26
 #define CE_HIT_BY_SOMETHING	27
-#define CE_OTHER_IS_HITTING	28
-#define CE_OTHER_GETS_HIT	29
+#define CE_HITTING_X		28
+#define CE_HIT_BY_X		29
 #define CE_BLOCKED		30
 
 #define NUM_CHANGE_EVENTS	31
 
 #define CE_BITMASK_DEFAULT	0
 
+#if 1
+
+#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 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)
+
+#else
+
 #define CH_EVENT_BIT(c)		(1 << (c))
 #define CH_EVENT_VAR(e)		(element_info[e].change->events)
 #define CH_ANY_EVENT_VAR(e)	(element_info[e].change_events)
@@ -219,6 +237,11 @@
 				 ((v) ?					  \
 				  (CH_EVENT_VAR(e) |=  CH_EVENT_BIT(c)) : \
 				  (CH_EVENT_VAR(e) &= ~CH_EVENT_BIT(c))) : 0)
+#define SET_ANY_CHANGE_EVENT(e,c,v) (IS_CUSTOM_ELEMENT(e) ?		  \
+			       ((v) ?					  \
+			        (CH_ANY_EVENT_VAR(e) |=  CH_EVENT_BIT(c)) : \
+			        (CH_ANY_EVENT_VAR(e) &= ~CH_EVENT_BIT(c))) : 0)
+#endif
 
 /* values for change side for custom elements */
 #define CH_SIDE_NONE		MV_NO_MOVING
@@ -527,6 +550,9 @@
 #define PLAYER_SWITCHING(p,x,y)	((p)->is_switching &&			\
 				 (p)->switch_x == (x) && (p)->switch_y == (y))
 
+#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 ANIM_FRAMES(g)		(graphic_info[g].anim_frames)
@@ -1362,10 +1388,17 @@
 
 /* program information and versioning definitions */
 
+#if 1
+#define PROGRAM_VERSION_MAJOR		3
+#define PROGRAM_VERSION_MINOR		1
+#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_BUILD		0
+#else
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
 #define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_BUILD		3
+#endif
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -1528,6 +1561,7 @@ struct PlayerInfo
   int num_special_action_sleeping;
 
   int switch_x, switch_y;
+  int drop_x, drop_y;
 
   int show_envelope;
 
@@ -1765,7 +1799,11 @@ struct ElementChangeInfo
 {
   boolean can_change;		/* use or ignore this change info */
 
+#if 1
+  boolean has_event[NUM_CHANGE_EVENTS];		/* change events */
+#else
   unsigned long events;		/* change events */
+#endif
 
   int trigger_player;		/* player triggering change */
   int trigger_side;		/* side triggering change */
@@ -1899,7 +1937,11 @@ struct ElementInfo
 
   /* ---------- internal values used at runtime when playing ---------- */
 
+#if 1
+  boolean has_change_event[NUM_CHANGE_EVENTS];
+#else
   unsigned long change_events;	/* bitfield for combined change events */
+#endif
 
   int event_page_nr[NUM_CHANGE_EVENTS]; /* page number for each event */
   struct ElementChangeInfo *event_page[NUM_CHANGE_EVENTS]; /* page for event */
@@ -2079,8 +2121,8 @@ extern short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean			Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern unsigned long		Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern unsigned long		ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern boolean			Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short			ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			CheckCollision[MAX_LEV_FIELDX][MAX_LEV_FIELDY];