X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=f841636fc2b1dc23649a8234082470f5a3b4942d;hp=8a093cbc9c3eabed7d85dc32c52f34f0528a76f6;hb=97ab44e482f2cc8e1f7a23199866098c3434f3b6;hpb=ce20797c3998436e5c54939ef2f56a4fe4a5b14d

diff --git a/src/editor.c b/src/editor.c
index 8a093cbc..f841636f 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -9114,6 +9114,10 @@ static void DrawPropertiesInfo()
 #define TEXT_CRACKING		"Score for cracking"
 #define TEXT_AMOEBA_SPEED	"Speed of amoeba growth"
 #define TEXT_DURATION		"Duration when activated"
+#define TEXT_DELAY_ON		"Delay before activating"
+#define TEXT_DELAY_OFF		"Delay before deactivating"
+#define TEXT_DELAY_EXPLODING	"Delay before exploding"
+#define TEXT_DELAY_MOVING	"Delay before moving"
 #define TEXT_BALL_DELAY		"Element generation delay"
 #define TEXT_MOVE_SPEED		"Speed of android moving"
 #define TEXT_CLONE_SPEED	"Speed of android cloning"
@@ -9195,6 +9199,15 @@ static struct
   { EL_EMC_KEY_7,	&level.score[SC_KEY],		TEXT_COLLECTING	},
   { EL_EMC_KEY_8,	&level.score[SC_KEY],		TEXT_COLLECTING	},
   { EL_DC_KEY_WHITE,	&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_MM_KETTLE,	&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_DF_CELL,		&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_MM_KEY,		&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_MM_LIGHTBALL,	&level.score[SC_ELEM_BONUS],	TEXT_COLLECTING	},
+  { EL_MM_PACMAN,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_MM_PACMAN_RIGHT,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_MM_PACMAN_UP,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_MM_PACMAN_LEFT,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_MM_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
   { EL_AMOEBA_WET,	&level.amoeba_speed,		TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_DRY,	&level.amoeba_speed,		TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_FULL,	&level.amoeba_speed,		TEXT_AMOEBA_SPEED },
@@ -9230,10 +9243,11 @@ static struct
   { EL_SPRING,		&level.slurp_score,		TEXT_SLURPING	},
   { EL_EMC_LENSES,	&level.lenses_time,		TEXT_DURATION	},
   { EL_EMC_MAGNIFIER,	&level.magnify_time,		TEXT_DURATION	},
-#if 0
-  /* defined, but currently not used in MM engine */
-  { EL_MM_FUSE_ACTIVE,	&level.mm_time_fuse,		TEXT_DURATION	},
-#endif
+  { EL_MM_FUSE_ACTIVE,	&level.mm_time_fuse,		TEXT_DELAY_OFF	},
+  { EL_MM_BOMB,		&level.mm_time_bomb,		TEXT_DELAY_EXPLODING },
+  { EL_MM_GRAY_BALL,	&level.mm_time_ball,		TEXT_DELAY_ON	},
+  { EL_MM_STEEL_BLOCK,	&level.mm_time_block,		TEXT_DELAY_MOVING },
+  { EL_MM_WOODEN_BLOCK,	&level.mm_time_block,		TEXT_DELAY_MOVING },
 
   { -1,			NULL,				NULL		}
 };
@@ -12203,6 +12217,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   /* do not mark level as modified for certain non-level-changing gadgets */
   if ((type_id >= ED_DRAWING_ID_EDITOR_FIRST &&
        type_id <= ED_DRAWING_ID_EDITOR_LAST) ||
+      actual_drawing_function == GADGET_ID_GRAB_BRUSH ||
       actual_drawing_function == GADGET_ID_PICK_ELEMENT)
     return;
 
@@ -12379,8 +12394,6 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
     }
 
     CopyElementPropertiesToGame(properties_element);
-
-    level.changed = TRUE;
   }
   else if (type_id == ED_SELECTBOX_ID_GAME_ENGINE_TYPE)
   {
@@ -12388,6 +12401,12 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
     ReinitializeElementList();
     ModifyEditorElementList();
   }
+
+  /* do not mark level as modified for certain non-level-changing gadgets */
+  if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
+    return;
+
+  level.changed = TRUE;
 }
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)