X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=57331cfc5eab280e439d76f1ed7f75ea554caf6f;hb=695b9e3d2e2ee94c93d2e804aa3c23dd34f68a25;hp=d9567731dc917532aaa6e6902aac7171e10ee579;hpb=58514a5b4392fa9501fced41921157633927ea94;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index d9567731..57331cfc 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,10 +4989,36 @@ static void DrawDrawingArea(int id)
 
 static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 {
-  int x,y;
+#if 1
+  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 (tmp_backbuffer == NULL)
+    tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+
+  /* needed when blitting directly to same bitmap -- should not be needed with
+     recent SDL libraries, but apparently does not work in 1.2.11 directly */
+  BlitBitmap(drawto, tmp_backbuffer,
+	     SX + (dx == -1 ? MINI_TILEX : 0),
+	     SY + (dy == -1 ? MINI_TILEY : 0),
+	     (ed_fieldx * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
+	     (ed_fieldy * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
+	     SX + (dx == +1 ? MINI_TILEX : 0),
+	     SY + (dy == +1 ? MINI_TILEY : 0));
+  BlitBitmap(tmp_backbuffer, drawto,
+	     SX + (dx == +1 ? MINI_TILEX : 0),
+	     SY + (dy == +1 ? MINI_TILEY : 0),
+	     (ed_fieldx * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
+	     (ed_fieldy * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
+	     SX + (dx == +1 ? MINI_TILEX : 0),
+	     SY + (dy == +1 ? MINI_TILEY : 0));
+
+#else
+
   BlitBitmap(drawto, drawto,
 	     SX + (dx == -1 ? MINI_TILEX : 0),
 	     SY + (dy == -1 ? MINI_TILEY : 0),
@@ -4999,6 +5026,10 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 	     (ed_fieldy * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
 	     SX + (dx == +1 ? MINI_TILEX : 0),
 	     SY + (dy == +1 ? MINI_TILEY : 0));
+#endif
+
+  printf("::: ScrollMiniLevel: A.1\n");
+
   if (dx)
   {
     x = (dx == 1 ? 0 : ed_fieldx - 1);
@@ -5012,6 +5043,8 @@ 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();
 }
@@ -6562,8 +6595,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++)
@@ -6739,11 +6772,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));
 
@@ -6891,6 +6926,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];
@@ -7066,6 +7102,12 @@ void DrawLevelEd()
   BlitBitmap(drawto, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
+#if 1
+  /* draw new control window (with border) to window */
+  redraw_mask |= REDRAW_ALL;
+  BackToFront();
+#endif
+
   OpenDoor(DOOR_OPEN_1);
 }
 
@@ -7318,7 +7360,7 @@ static void DrawDrawingWindow()
   stick_element_properties_window = FALSE;
 
   SetMainBackgroundImage(IMG_UNDEFINED);
-  ClearWindow();
+  ClearField();
 
   UnmapLevelEditorWindowGadgets();
   UnmapLevelEditorToolboxCustomGadgets();
@@ -7341,7 +7383,7 @@ static void DrawLevelInfoWindow()
   stick_element_properties_window = FALSE;
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
-  ClearWindow();
+  ClearField();
   UnmapLevelEditorWindowGadgets();
 
 #if 0
@@ -7676,6 +7718,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"			},
@@ -8311,7 +8354,7 @@ static void DrawPropertiesWindow()
     MapLevelEditorToolboxCustomGadgets();
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
-  ClearWindow();
+  ClearField();
 
 #if 0
   DrawTextSCentered(ED_SETTINGS1_YPOS, FONT_TITLE_1, "Element Settings");
@@ -10294,7 +10337,10 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
   if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
   {
       LoadLevel(level_nr);
+      LoadScore(level_nr);
+
       TapeErase();
+
       ResetUndoBuffer();
       DrawEditModeWindow();