rnd-20051211-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 32e9a6d12cbaaef8d6fd3cba4cf665dbe2c9a301..d141e16a962ad3bc9112eb3d4ba598ca872148f5 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1056,7 +1056,7 @@ static struct
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_CUSTOM_SCORE_DOWN,       GADGET_ID_CUSTOM_SCORE_UP,
     GADGET_ID_CUSTOM_SCORE_TEXT,       GADGET_ID_NONE,
-    &custom_element.collect_score,
+    &custom_element.collect_score_initial,
     NULL,                              "score", " "
   },
   {
@@ -1064,7 +1064,7 @@ static struct
     MIN_COLLECT_COUNT,                 MAX_COLLECT_COUNT,
     GADGET_ID_CUSTOM_GEMCOUNT_DOWN,    GADGET_ID_CUSTOM_GEMCOUNT_UP,
     GADGET_ID_CUSTOM_GEMCOUNT_TEXT,    GADGET_ID_CUSTOM_SCORE_UP,
-    &custom_element.collect_count,
+    &custom_element.collect_count_initial,
     NULL,                              "count", NULL
   },
   {
@@ -1538,9 +1538,11 @@ static struct ValueTextInfo options_action_type[] =
   { CA_SET_SCORE,              "set score"                     },
   { CA_SET_CE_SCORE,           "set CE score"                  },
   { CA_SET_CE_COUNT,           "set CE count"                  },
+#if 0
   { CA_SET_DYNABOMB_NUMBER,    "set bomb number"               },
   { CA_SET_DYNABOMB_SIZE,      "set bomb size"                 },
   { CA_SET_DYNABOMB_POWER,     "set bomb power"                },
+#endif
   { CA_TOGGLE_PLAYER_GRAVITY,  "toggle gravity"                },
   { CA_ENABLE_PLAYER_GRAVITY,  "enable gravity"                },
   { CA_DISABLE_PLAYER_GRAVITY, "disable gravity"               },
@@ -1551,11 +1553,12 @@ static struct ValueTextInfo options_action_type[] =
 static struct ValueTextInfo options_action_mode[] =
 {
   { CA_MODE_UNDEFINED,         " "                             },
+  { CA_MODE_SET,               "="                             },
   { CA_MODE_ADD,               "+"                             },
   { CA_MODE_SUBTRACT,          "-"                             },
   { CA_MODE_MULTIPLY,          "*"                             },
   { CA_MODE_DIVIDE,            "/"                             },
-  { CA_MODE_SET,               "="                             },
+  { CA_MODE_MODULO,            "%"                             },
 
   { -1,                                NULL                            }
 };
@@ -2841,14 +2844,14 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_WALL_11,
   EL_EMC_WALL_12,
 
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
 #else
   EL_EMC_ANDROID,
 #endif
   EL_BALLOON,
   EL_BALLOON_SWITCH_ANY,
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
 #else
   EL_BALLOON_SWITCH_NONE,
@@ -2861,7 +2864,7 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_GRASS,
   EL_EMC_PLANT,
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2869,7 +2872,7 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGNIFIER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2877,13 +2880,13 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGIC_BALL_SWITCH,
 #endif
   EL_SPRING,
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
 #else
   EL_EMC_SPRING_BUMPER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_3_1_2
   EL_EMPTY,
 #else
   EL_EMC_DRIPPER,
@@ -5712,8 +5715,8 @@ static void copy_custom_element_settings(int element_from, int element_to)
 
   ei_to->access_direction = ei_from->access_direction;
 
-  ei_to->collect_score = ei_from->collect_score;
-  ei_to->collect_count = ei_from->collect_count;
+  ei_to->collect_score_initial = ei_from->collect_score_initial;
+  ei_to->collect_count_initial = ei_from->collect_count_initial;
 
   ei_to->push_delay_fixed = ei_from->push_delay_fixed;
   ei_to->push_delay_random = ei_from->push_delay_random;