X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=55b70f76d5d5d28604479014b03ea0a10fe0175b;hb=aa014c27deee1f1f190f756a20eef2fa08308c47;hp=13481c98f09281b592a79a86fa02030c394a2116;hpb=92d8ae6724d18c36c22a68cb7ce290272c9e3681;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 13481c98..55b70f76 100644
--- a/src/main.h
+++ b/src/main.h
@@ -377,7 +377,13 @@
 #define CA_ARG_ELEMENT_RESET		(CA_ARG_ELEMENT + 0)
 #define CA_ARG_ELEMENT_TARGET		(CA_ARG_ELEMENT + 1)
 #define CA_ARG_ELEMENT_TRIGGER		(CA_ARG_ELEMENT + 2)
-#define CA_ARG_ELEMENT_HEADLINE		(CA_ARG_ELEMENT + 999)
+#define CA_ARG_ELEMENT_HEADLINE		(CA_ARG_ELEMENT + 998)
+#define CA_ARG_ELEMENT_CV_TARGET	(CA_ARG_ELEMENT_TARGET)
+#define CA_ARG_ELEMENT_CV_TRIGGER	(CA_ARG_ELEMENT_TRIGGER)
+#define CA_ARG_ELEMENT_CV_HEADLINE	(CA_ARG_ELEMENT_HEADLINE)
+#define CA_ARG_ELEMENT_NR_TARGET	(CA_ARG_ELEMENT + 3)
+#define CA_ARG_ELEMENT_NR_TRIGGER	(CA_ARG_ELEMENT + 4)
+#define CA_ARG_ELEMENT_NR_HEADLINE	(CA_ARG_ELEMENT + 999)
 #define CA_ARG_SPEED			13000
 #define CA_ARG_SPEED_NOT_MOVING		(CA_ARG_SPEED + STEPSIZE_NOT_MOVING)
 #define CA_ARG_SPEED_VERY_SLOW		(CA_ARG_SPEED + STEPSIZE_VERY_SLOW)
@@ -1195,6 +1201,7 @@
 #define EL_TRIGGER_ELEMENT		657
 #define EL_TRIGGER_PLAYER		658
 
+/* SP style elements */
 #define EL_SP_GRAVITY_ON_PORT_RIGHT	659
 #define EL_SP_GRAVITY_ON_PORT_DOWN	660
 #define EL_SP_GRAVITY_ON_PORT_LEFT	661
@@ -1204,8 +1211,7 @@
 #define EL_SP_GRAVITY_OFF_PORT_LEFT	665
 #define EL_SP_GRAVITY_OFF_PORT_UP	666
 
-
-/* the following EMC style elements are currently not implemented in R'n'D */
+/* EMC style elements */
 #define EL_BALLOON_SWITCH_NONE		667
 #define EL_EMC_GATE_5			668
 #define EL_EMC_GATE_6			669
@@ -1245,7 +1251,9 @@
 #define EL_EMC_FAKE_ACID		703
 #define EL_EMC_DRIPPER			704
 
-#define NUM_FILE_ELEMENTS		705
+#define EL_TRIGGER_CE_VALUE		705
+
+#define NUM_FILE_ELEMENTS		706
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1337,8 +1345,10 @@
 #define EL_DIAGONAL_SHRINKING		(EL_FIRST_RUNTIME_UNREAL + 19)
 #define EL_DIAGONAL_GROWING		(EL_FIRST_RUNTIME_UNREAL + 20)
 
+#define NUM_RUNTIME_ELEMENTS		(EL_FIRST_RUNTIME_UNREAL + 21)
+
 /* dummy elements (never used as game elements, only used as graphics) */
-#define EL_FIRST_DUMMY			(EL_FIRST_RUNTIME_UNREAL + 21)
+#define EL_FIRST_DUMMY			NUM_RUNTIME_ELEMENTS
 
 #define EL_STEELWALL_TOPLEFT		(EL_FIRST_DUMMY + 0)
 #define EL_STEELWALL_TOPRIGHT		(EL_FIRST_DUMMY + 1)