X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=bcb76d4f96acfa6089f6b04445fcd0bf9a8f5fc1;hp=2fab93d6a7d73b5d5657f22b5b09f32378db25b8;hb=2a8cb1d38a6d7074927b740a81b51242007142f3;hpb=85d006b46303672112431f6a333c3e1de6acbabb

diff --git a/src/editor.c b/src/editor.c
index 2fab93d6..bcb76d4f 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1515,6 +1515,7 @@ static struct ValueTextInfo options_deadliness[] =
 {
   { EP_DONT_RUN_INTO,		"running into"			},
   { EP_DONT_COLLIDE_WITH,	"colliding with"		},
+  { EP_DONT_GET_HIT_BY,		"getting hit by"		},
   { EP_DONT_TOUCH,		"touching"			},
 
   { -1,				NULL				}
@@ -3092,7 +3093,7 @@ static struct
   {
     -1,					ED_AREA_1X1_SETTINGS_YPOS(5),
     GADGET_ID_CUSTOM_CHANGE_TRIGGER,	GADGET_ID_CHANGE_OTHER_ACTION,
-    &custom_element_change.trigger_element, 1, 1,
+    &custom_element_change.initial_trigger_element, 1, 1,
     NULL, NULL, NULL,			"other element triggering change"
   },
 
@@ -4988,14 +4989,16 @@ static void DrawDrawingArea(int id)
 
 static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 {
-#if 1
+#if 0
+  /* (directly solved in BlitBitmap() now) */
   static Bitmap *tmp_backbuffer = NULL;
 #endif
   int x, y;
   int dx = (scroll == ED_SCROLL_LEFT ? -1 : scroll == ED_SCROLL_RIGHT ? 1 : 0);
   int dy = (scroll == ED_SCROLL_UP   ? -1 : scroll == ED_SCROLL_DOWN  ? 1 : 0);
 
-#if 1
+#if 0
+  /* (directly solved in BlitBitmap() now) */
   if (tmp_backbuffer == NULL)
     tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
 
@@ -5027,8 +5030,6 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 	     SY + (dy == +1 ? MINI_TILEY : 0));
 #endif
 
-  printf("::: ScrollMiniLevel: A.1\n");
-
   if (dx)
   {
     x = (dx == 1 ? 0 : ed_fieldx - 1);
@@ -5042,8 +5043,6 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
       DrawMiniElementOrWall(x, y, from_x, from_y);
   }
 
-  printf("::: ScrollMiniLevel: Z\n");
-
   redraw_mask |= REDRAW_FIELD;
   BackToFront();
 }
@@ -6594,8 +6593,8 @@ static void replace_custom_element_in_settings(int element_from,
       if (change->target_element == element_from)
 	change->target_element = element_to;
 
-      if (change->trigger_element == element_from)
-	change->trigger_element = element_to;
+      if (change->initial_trigger_element == element_from)
+	change->initial_trigger_element = element_to;
 
       for (y = 0; y < 3; y++)
 	for (x = 0; x < 3; x++)
@@ -6771,11 +6770,13 @@ static void CopyCustomElementPropertiesToEditor(int element)
   /* set deadliness selectbox help value */
   custom_element.deadliness =
     (DONT_TOUCH(element) ? EP_DONT_TOUCH :
+     DONT_GET_HIT_BY(element) ? EP_DONT_GET_HIT_BY :
      DONT_COLLIDE_WITH(element) ? EP_DONT_COLLIDE_WITH :
      DONT_RUN_INTO(element) ? EP_DONT_RUN_INTO :
      custom_element.deadliness);
   custom_element_properties[EP_DEADLY] =
     (DONT_TOUCH(element) ||
+     DONT_GET_HIT_BY(element) ||
      DONT_COLLIDE_WITH(element) ||
      DONT_RUN_INTO(element));
 
@@ -6923,6 +6924,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   /* set deadliness property from checkbox and selectbox */
   custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
   custom_element_properties[EP_DONT_COLLIDE_WITH] = FALSE;
+  custom_element_properties[EP_DONT_GET_HIT_BY] = FALSE;
   custom_element_properties[EP_DONT_TOUCH] = FALSE;
   custom_element_properties[custom_element.deadliness] =
     custom_element_properties[EP_DEADLY];
@@ -7714,6 +7716,7 @@ static void DrawPropertiesInfo()
 
     { EP_DONT_RUN_INTO,		"- deadly when running into"		},
     { EP_DONT_COLLIDE_WITH,	"- deadly when colliding with"		},
+    { EP_DONT_GET_HIT_BY,	"- deadly when getting hit by"		},
     { EP_DONT_TOUCH,		"- deadly when touching"		},
 
     { EP_INDESTRUCTIBLE,	"- indestructible"			},
@@ -7887,6 +7890,7 @@ static struct
   { EL_EMC_KEY_6,	&level.score[SC_KEY],		TEXT_COLLECTING	},
   { 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_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 },