X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=73a08b16baab16d80990901919ce274ca83fec5a;hp=32e9a6d12cbaaef8d6fd3cba4cf665dbe2c9a301;hb=ff9566324863d1ba0a72478982fe9c2b4ff3dd88;hpb=ee749a764df3dfa944c1f9de740ccbeb1cfdef40

diff --git a/src/editor.c b/src/editor.c
index 32e9a6d1..73a08b16 100644
--- 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				}
 };
@@ -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;