X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=ed78feab149af7f69bbd7efbb7416d79d9ff8514;hb=7119b5d2e756b1ab23818ea39d19aece0563bab0;hp=c760e12da1a79a9e6a159934793e56211fd77568;hpb=e946a4f25cf18a083043d05beca2887ad16d7b53;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index c760e12d..ed78feab 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -263,39 +263,40 @@
 #define GADGET_ID_ELEM_CONTENT_6	56
 #define GADGET_ID_ELEM_CONTENT_7	57
 #define GADGET_ID_AMOEBA_CONTENT	58
+#define GADGET_ID_RANDOM_BACKGROUND	59
 
 /* text input identifiers */
-#define GADGET_ID_LEVEL_NAME		59
-#define GADGET_ID_LEVEL_AUTHOR		60
+#define GADGET_ID_LEVEL_NAME		60
+#define GADGET_ID_LEVEL_AUTHOR		61
 
 /* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLL_UP		61
-#define GADGET_ID_SCROLL_DOWN		62
-#define GADGET_ID_SCROLL_LEFT		63
-#define GADGET_ID_SCROLL_RIGHT		64
-#define GADGET_ID_SCROLL_HORIZONTAL	65
-#define GADGET_ID_SCROLL_VERTICAL	66
+#define GADGET_ID_SCROLL_UP		62
+#define GADGET_ID_SCROLL_DOWN		63
+#define GADGET_ID_SCROLL_LEFT		64
+#define GADGET_ID_SCROLL_RIGHT		65
+#define GADGET_ID_SCROLL_HORIZONTAL	66
+#define GADGET_ID_SCROLL_VERTICAL	67
 
 /* gadgets for scrolling element list */
-#define GADGET_ID_SCROLL_LIST_UP	67
-#define GADGET_ID_SCROLL_LIST_DOWN	68
-#define GADGET_ID_SCROLL_LIST_VERTICAL	69
-
-/* buttons for level settings */
-#define GADGET_ID_RANDOM_PERCENTAGE	70
-#define GADGET_ID_RANDOM_QUANTITY	71
-#define GADGET_ID_RANDOM_RESTRICTED	72
-#define GADGET_ID_DOUBLE_SPEED		73
-#define GADGET_ID_GRAVITY		74
-#define GADGET_ID_STICK_ELEMENT		75
-#define GADGET_ID_EM_SLIPPERY_GEMS	76
-
-/* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND	77
+#define GADGET_ID_SCROLL_LIST_UP	68
+#define GADGET_ID_SCROLL_LIST_DOWN	69
+#define GADGET_ID_SCROLL_LIST_VERTICAL	70
+
+/* buttons for level/element properties */
+#define GADGET_ID_RANDOM_PERCENTAGE	71
+#define GADGET_ID_RANDOM_QUANTITY	72
+#define GADGET_ID_RANDOM_RESTRICTED	73
+#define GADGET_ID_DOUBLE_SPEED		74
+#define GADGET_ID_GRAVITY		75
+#define GADGET_ID_STICK_ELEMENT		76
+#define GADGET_ID_EM_SLIPPERY_GEMS	77
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE	78
+#define GADGET_ID_CUSTOM_CAN_FALL	79
+#define GADGET_ID_CUSTOM_SLIPPERY	80
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST	78
-#define GADGET_ID_ELEMENTLIST_LAST	(78 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
+#define GADGET_ID_ELEMENTLIST_FIRST	81
+#define GADGET_ID_ELEMENTLIST_LAST	(81 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define NUM_EDITOR_GADGETS		(GADGET_ID_ELEMENTLIST_LAST + 1)
 
@@ -358,12 +359,18 @@
 #define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED	2
 #define ED_CHECKBUTTON_ID_STICK_ELEMENT		3
 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS	4
+#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE	5
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL	6
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY	7
 
-#define ED_NUM_CHECKBUTTONS			5
+#define ED_NUM_CHECKBUTTONS			8
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST	ED_CHECKBUTTON_ID_DOUBLE_SPEED
 #define ED_CHECKBUTTON_ID_LEVEL_LAST	ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 
+#define ED_CHECKBUTTON_ID_CUSTOM_FIRST	ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST	ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY
+
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE	0
 #define ED_RADIOBUTTON_ID_QUANTITY	1
@@ -424,6 +431,13 @@ static int random_placement_background_element = EL_SAND;
 static boolean random_placement_background_restricted = FALSE;
 static boolean stick_element_properties_window = FALSE;
 
+static struct
+{
+  boolean indestructible;
+  boolean can_fall;
+  boolean slippery;
+} custom_element_properties[NUM_CUSTOM_ELEMENTS];
+
 static struct
 {
   int x, y;
@@ -678,6 +692,24 @@ static struct
     GADGET_ID_EM_SLIPPERY_GEMS,
     &level.em_slippery_gems,
     "slip down from certain flat walls","use EM style slipping behaviour"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
+    GADGET_ID_CUSTOM_INDESTRUCTIBLE,
+    &custom_element_properties[0].indestructible,
+    "indestructible",			"element cannot be destroyed"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(5),
+    GADGET_ID_CUSTOM_CAN_FALL,
+    &custom_element_properties[0].can_fall,
+    "can fall",				"element can fall down"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(6),
+    GADGET_ID_CUSTOM_SLIPPERY,
+    &custom_element_properties[0].slippery,
+    "slippery",				"other elements can fall down from it"
   }
 };
 
@@ -1793,7 +1825,7 @@ static void CreateControlButtons()
     gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
     gd_y  = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
 
-    getMiniGraphicSource(el2img(element), &deco_bitmap, &deco_x, &deco_y);
+    getMiniGraphicSource(el2edimg(element), &deco_bitmap, &deco_x, &deco_y);
     deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
 
@@ -2420,6 +2452,63 @@ static boolean LevelContainsPlayer()
   return player_found;
 }
 
+static void CopyPlayfield(short src[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
+			  short dst[MAX_LEV_FIELDX][MAX_LEV_FIELDY])
+{
+  int x, y;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++) 
+      dst[x][y] = src[x][y];
+}
+
+static void CopyCustomElementPropertiesToEditor()
+{
+  int i;
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+    int properties = Properties1[element];
+
+    custom_element_properties[i].indestructible =
+      ((properties & EP_BIT_MASSIVE) != 0 ? TRUE : FALSE);
+
+    custom_element_properties[i].can_fall =
+      ((properties & EP_BIT_CAN_FALL) != 0 ? TRUE : FALSE);
+
+    custom_element_properties[i].slippery =
+      ((properties & EP_BIT_SLIPPERY) != 0 ? TRUE : FALSE);
+  }
+}
+
+static void CopyCustomElementPropertiesToGame()
+{
+  int i;
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+
+    Properties1[element] = EP_BITMASK_DEFAULT;
+
+    if (custom_element_properties[i].indestructible)
+      Properties1[element] |= EP_BIT_MASSIVE;
+    else
+      Properties1[element] &= ~EP_BIT_MASSIVE;
+
+    if (custom_element_properties[i].can_fall)
+      Properties1[element] |= EP_BIT_CAN_FALL;
+    else
+      Properties1[element] &= ~EP_BIT_CAN_FALL;
+
+    if (custom_element_properties[i].slippery)
+      Properties1[element] |= EP_BIT_SLIPPERY;
+    else
+      Properties1[element] &= ~EP_BIT_SLIPPERY;
+  }
+}
+
 void DrawLevelEd()
 {
   CloseDoor(DOOR_CLOSE_ALL);
@@ -2427,15 +2516,8 @@ void DrawLevelEd()
 
   if (level_editor_test_game)
   {
-    int x, y;
-
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	Feld[x][y] = Ur[x][y];
-
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	Ur[x][y] = FieldBackup[x][y];
+    CopyPlayfield(Ur, Feld);
+    CopyPlayfield(FieldBackup, Ur);
 
     level_editor_test_game = FALSE;
   }
@@ -2455,13 +2537,13 @@ void DrawLevelEd()
   /* draw mouse button brush elements */
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		     el2img(new_element1));
+		     el2edimg(new_element1));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		     el2img(new_element2));
+		     el2edimg(new_element2));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		     el2img(new_element3));
+		     el2edimg(new_element3));
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -2637,21 +2719,21 @@ static void PickDrawingElement(int button, int element)
     new_element1 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		       el2img(new_element1));
+		       el2edimg(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		       el2img(new_element2));
+		       el2edimg(new_element2));
   }
   else
   {
     new_element3 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		       el2img(new_element3));
+		       el2edimg(new_element3));
   }
 
   redraw_mask |= REDRAW_DOOR_1;
@@ -2934,7 +3016,7 @@ static void DrawPropertiesWindow()
     { EL_PACMAN_LEFT,	&level.score[SC_PACMAN],	TEXT_SMASHING },
     { EL_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING },
     { EL_NUT,		&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
-    { EL_DYNAMITE	,&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
+    { EL_DYNAMITE,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
     { EL_KEY1,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
     { EL_KEY2,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
     { EL_KEY3,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
@@ -2965,7 +3047,7 @@ static void DrawPropertiesWindow()
   DrawGraphicAnimationExt(drawto,
 			  SX + xstart * MINI_TILEX,
 			  SY + ystart * MINI_TILEY + MINI_TILEY / 2,
-			  el2img(properties_element), -1, NO_MASKING);
+			  el2edimg(properties_element), -1, NO_MASKING);
 
   FrameCounter = 0;	/* restart animation frame counter */
 
@@ -3030,6 +3112,49 @@ static void DrawPropertiesWindow()
 		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
     MapCheckbuttonGadget(i);
   }
+
+  if (IS_CUSTOM_ELEMENT(properties_element))
+  {
+    int nr = properties_element - EL_CUSTOM_START;
+
+    CopyCustomElementPropertiesToEditor();
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
+
+    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
+
+    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].slippery;
+
+    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+  }
 }
 
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
@@ -3752,11 +3877,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	DrawMiniGraphicExt(drawto,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2img(new_element));
+			   el2edimg(new_element));
 	DrawMiniGraphicExt(window,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2img(new_element));
+			   el2edimg(new_element));
 
 	if (id == GADGET_ID_AMOEBA_CONTENT)
 	  level.amoeba_content = new_element;
@@ -3941,7 +4066,13 @@ static void HandleRadiobuttons(struct GadgetInfo *gi)
 
 static void HandleCheckbuttons(struct GadgetInfo *gi)
 {
-  *checkbutton_info[gi->custom_type_id].value ^= TRUE;
+  int type_id = gi->custom_type_id;
+
+  *checkbutton_info[type_id].value ^= TRUE;
+
+  if (type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
+      type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST)
+    CopyCustomElementPropertiesToGame();
 }
 
 static void HandleControlButtons(struct GadgetInfo *gi)
@@ -4078,7 +4209,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	int element = editor_elements[element_shift + i];
 
 	UnmapGadget(gi);
-	getMiniGraphicSource(el2img(element), &gd->bitmap, &gd->x, &gd->y);
+	getMiniGraphicSource(el2edimg(element), &gd->bitmap, &gd->x, &gd->y);
 	ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
 	MapGadget(gi);
       }
@@ -4185,9 +4316,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       {
 	if (Request("Save this level and kill the old ?", REQ_ASK))
 	{
-	  for(x=0; x<lev_fieldx; x++)
-	    for(y=0; y<lev_fieldy; y++) 
-	      Ur[x][y] = Feld[x][y];
+	  CopyPlayfield(Feld, Ur);
+
 	  SaveLevel(level_nr);
 	}
       }
@@ -4201,13 +4331,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	if (LevelChanged())
 	  level.game_version = GAME_VERSION_ACTUAL;
 
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    FieldBackup[x][y] = Ur[x][y];
-
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    Ur[x][y] = Feld[x][y];
+	CopyPlayfield(Ur, FieldBackup);
+	CopyPlayfield(Feld, Ur);
 
 	UnmapLevelEditorGadgets();
 	UndrawSpecialEditorDoor();
@@ -4354,7 +4479,7 @@ void HandleLevelEditorIdle()
   DrawGraphicAnimationExt(drawto,
 			  SX + xpos * TILEX,
 			  SY + ypos * TILEY + MINI_TILEY / 2,
-			  el2img(properties_element), -1, NO_MASKING);
+			  el2edimg(properties_element), -1, NO_MASKING);
 
   MarkTileDirty(xpos, ypos);
   MarkTileDirty(xpos, ypos + 1);