rnd-20051208-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index d18e2de2da392a0770c7312c6ed97c36c6d6f74b..e80c5c49ae185299f3b5de3207c9573094f3166f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -290,11 +290,12 @@
 
 /* values for change action mode for custom elements */
 #define CA_MODE_UNDEFINED      0
-#define CA_MODE_ADD            1
-#define CA_MODE_SUBTRACT       2
-#define CA_MODE_MULTIPLY       3
-#define CA_MODE_DIVIDE         4
-#define CA_MODE_SET            5
+#define CA_MODE_SET            1
+#define CA_MODE_ADD            2
+#define CA_MODE_SUBTRACT       3
+#define CA_MODE_MULTIPLY       4
+#define CA_MODE_DIVIDE         5
+#define CA_MODE_MODULO         6
 
 /* values for change action parameters for custom elements */
 #define CA_ARG_MIN             0
@@ -1942,8 +1943,8 @@ struct ElementInfo
 
   int access_direction;                /* accessible from which direction */
 
-  int collect_score;           /* score value for collecting */
-  int collect_count;           /* count value for collecting */
+  int collect_score_initial;   /* initial score value for collecting */
+  int collect_count_initial;   /* initial count value for collecting */
 
   int push_delay_fixed;                /* constant delay before pushing */
   int push_delay_random;       /* additional random delay before pushing */
@@ -1968,8 +1969,6 @@ struct ElementInfo
   int explosion_delay;         /* duration of explosion of this element */
   int ignition_delay;          /* delay for explosion by other explosion */
 
-  int counter_initial;         /* initial value of generic CE counter */
-
   struct ElementChangeInfo *change_page; /* actual list of change pages */
   struct ElementChangeInfo *change;     /* pointer to current change page */
 
@@ -1987,7 +1986,7 @@ struct ElementInfo
 
   boolean in_group[NUM_GROUP_ELEMENTS];
 
-  int counter;                 /* current value of generic CE counter */
+  int collect_score;           /* runtime score value for collecting */
 
   /* ---------- internal values used in level editor ---------- */
 
@@ -2147,6 +2146,7 @@ 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                   ChangePage[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short                   Count[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];