rnd-20030507-2-src

diff --git a/src/conftime.h b/src/conftime.h
index 2dbf97d0b12b3c59261e8e4de1f5e3797d92a2c7..261aacbf7f3363b41528249a8aa083b4eddd4cff 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-05-07 01:01]"
+#define COMPILE_DATE_STRING "[2003-05-07 23:10]"

diff --git a/src/editor.c b/src/editor.c
index 5884e40f8f5b00902a567072e92e3e10655dcac8..8e326ea29e5fe32324bbf40c97b7f8aabaacc448 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -306,11 +306,12 @@
 #define GADGET_ID_ELEMENT_CONTENT_6    (GADGET_ID_DRAWING_AREA_FIRST + 7)
 #define GADGET_ID_ELEMENT_CONTENT_7    (GADGET_ID_DRAWING_AREA_FIRST + 8)
 #define GADGET_ID_AMOEBA_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 9)
-#define GADGET_ID_CUSTOM_CHANGED       (GADGET_ID_DRAWING_AREA_FIRST + 10)
-#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 11)
+#define GADGET_ID_CUSTOM_GRAPHIC       (GADGET_ID_DRAWING_AREA_FIRST + 10)
+#define GADGET_ID_CUSTOM_CHANGED       (GADGET_ID_DRAWING_AREA_FIRST + 11)
+#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 12)
 
 /* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 12)
+#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 13)
 
 #define GADGET_ID_LEVEL_NAME           (GADGET_ID_TEXT_INPUT_FIRST + 0)
 #define GADGET_ID_LEVEL_AUTHOR         (GADGET_ID_TEXT_INPUT_FIRST + 1)
@@ -1043,6 +1044,7 @@ static int new_element3 = EL_SAND;
 static void ModifyEditorCounter(int, int);
 static void ModifyEditorCounterLimits(int, int, int);
 static void ModifyEditorSelectbox(int, int);
+static void ModifyEditorElementList();
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
@@ -2395,6 +2397,25 @@ static void CreateDrawingAreas()
 
   level_editor_gadget[id] = gi;
 
+  /* ... one for each custom element optional graphic element ... */
+  id = GADGET_ID_CUSTOM_GRAPHIC;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+                   GDI_X, SX + 2 * MINI_TILEX,
+                   GDI_Y, SY + 4 * MINI_TILEY + MINI_TILEY / 2,
+                   GDI_WIDTH, TILEX,
+                   GDI_HEIGHT, TILEY,
+                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
+                   GDI_ITEM_SIZE, TILEX, TILEY,
+                   GDI_EVENT_MASK, event_mask,
+                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
+                   GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[id] = gi;
+
   /* ... one for each custom element change target element ... */
   id = GADGET_ID_CUSTOM_CHANGED;
   gi = CreateGadget(GDI_CUSTOM_ID, id,
@@ -3192,6 +3213,24 @@ static void ModifyEditorSelectbox(int selectbox_id, int new_value)
   ModifyGadget(gi, GDI_SELECTBOX_INDEX, new_index_value, GDI_END);
 }
 
+static void ModifyEditorElementList()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+  {
+    int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
+    struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+    struct GadgetDesign *gd = &gi->deco.design;
+    int element = editor_elements[element_shift + i];
+
+    UnmapGadget(gi);
+    getMiniGraphicSource(el2edimg(element), &gd->bitmap, &gd->x, &gd->y);
+    ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
+    MapGadget(gi);
+  }
+}
+
 static void PickDrawingElement(int button, int element)
 {
   if (button < 1 || button > 3)
@@ -3655,8 +3694,6 @@ static void DrawPropertiesConfig()
 
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
-    CopyCustomElementPropertiesToEditor(properties_element);
-
     /* draw checkbutton gadgets */
     for (i =  ED_CHECKBUTTON_ID_CUSTOM_FIRST;
         i <= ED_CHECKBUTTON_ID_CUSTOM_LAST; i++)
@@ -3994,8 +4031,6 @@ static void DrawPropertiesAdvanced()
   int yoffset_right2 = ED_BORDER_SIZE;
   int i, x, y;
 
-  CopyCustomElementPropertiesToEditor(properties_element);
-
   /* draw stickybutton gadget */
   i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
   checkbutton_info[i].y = ED_COUNTER_YPOS2(4);
@@ -4038,6 +4073,9 @@ static void DrawPropertiesAdvanced()
     MapCheckbuttonGadget(i);
   }
 
+  /* map gadget for optional graphic element */
+  MapDrawingArea(GADGET_ID_CUSTOM_GRAPHIC);
+
   DrawCustomChangedArea();
 
   /* draw selectbox gadgets */
@@ -4073,6 +4111,9 @@ static void DrawPropertiesWindow()
       !checkPropertiesConfig())
     edit_mode_properties = ED_MODE_PROPERTIES_INFO;
 
+  if (IS_CUSTOM_ELEMENT(properties_element))
+    CopyCustomElementPropertiesToEditor(properties_element);
+
   UnmapLevelEditorWindowGadgets();
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
@@ -4726,6 +4767,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   int sx = gi->event.x, sy = gi->event.y;
   int min_sx = 0, min_sy = 0;
   int max_sx = gi->drawing.area_xsize - 1, max_sy = gi->drawing.area_ysize - 1;
+  int item_xsize = gi->drawing.item_xsize, item_ysize = gi->drawing.item_ysize;
   int lx = 0, ly = 0;
   int min_lx = 0, min_ly = 0;
   int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
@@ -4821,17 +4863,34 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       }
       else
       {
-       DrawMiniGraphicExt(drawto,
-                          gi->x + sx * MINI_TILEX,
-                          gi->y + sy * MINI_TILEY,
-                          el2edimg(new_element));
-       DrawMiniGraphicExt(window,
-                          gi->x + sx * MINI_TILEX,
-                          gi->y + sy * MINI_TILEY,
-                          el2edimg(new_element));
+       if (item_xsize == MINI_TILEX && item_ysize == MINI_TILEY)
+         DrawMiniGraphicExt(drawto,
+                            gi->x + sx * MINI_TILEX,
+                            gi->y + sy * MINI_TILEY,
+                            el2edimg(new_element));
+       else
+         DrawGraphicExt(drawto,
+                        gi->x + sx * TILEX,
+                        gi->y + sy * TILEY,
+                        el2img(new_element), 0);
 
        if (id == GADGET_ID_AMOEBA_CONTENT)
          level.amoeba_content = new_element;
+       else if (id == GADGET_ID_CUSTOM_GRAPHIC &&
+                IS_CUSTOM_ELEMENT(properties_element))
+       {
+         int i = properties_element - EL_CUSTOM_START;
+
+         if (IS_CUSTOM_ELEMENT(new_element))
+           new_element = CUSTOM_ELEMENT_INFO(new_element).change.gfx_element;
+
+         custom_element_change.gfx_element = new_element;
+         level.custom_element[i].change = custom_element_change;
+
+         ModifyEditorElementList();
+
+         FrameCounter = 0;     /* restart animation frame counter */
+       }
        else if (id == GADGET_ID_CUSTOM_CHANGED &&
                 IS_CUSTOM_ELEMENT(properties_element))
        {
@@ -5072,7 +5131,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
   int button = gi->event.button;
   int step = BUTTON_STEPSIZE(button);
   int new_element = BUTTON_ELEMENT(button);
-  int i, x, y;
+  int x, y;
 
   if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
     DrawLevelText(0, 0, 0, TEXT_END);
@@ -5192,18 +5251,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
                     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
       }
 
-      for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
-      {
-       int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
-       struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-       struct GadgetDesign *gd = &gi->deco.design;
-       int element = editor_elements[element_shift + i];
-
-       UnmapGadget(gi);
-       getMiniGraphicSource(el2edimg(element), &gd->bitmap, &gd->x, &gd->y);
-       ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
-       MapGadget(gi);
-      }
+      ModifyEditorElementList();
+
       break;
 
     case GADGET_ID_WRAP_LEFT:
@@ -5653,6 +5702,9 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   else if (id == GADGET_ID_AMOEBA_CONTENT)
     DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
              "Amoeba content");
+  else if (id == GADGET_ID_CUSTOM_GRAPHIC)
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+             "Optional custom graphic element");
   else if (id == GADGET_ID_CUSTOM_CHANGED)
     DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
              "New element after change");

diff --git a/src/files.c b/src/files.c
index c94e1a5c5f01cd60d35cf7774200c08b683ee9cc..fadd0b6de8614682dfc32a69124cccaab36c2080 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -97,18 +97,17 @@ static void setLevelInfoToDefaults()
 
   for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
+    int element = EL_CUSTOM_START + i;
+
     level.custom_element[i].change.events = CE_BITMASK_DEFAULT;
+    level.custom_element[i].change.gfx_element = element;
     level.custom_element[i].change.successor = EL_EMPTY_SPACE;
     level.custom_element[i].change.delay_fixed = 0;
     level.custom_element[i].change.delay_random = 0;
 
     /* start with no properties at all */
-#if 1
     for (j=0; j < NUM_EP_BITFIELDS; j++)
-      Properties[EL_CUSTOM_START + i][j] = EP_BITMASK_DEFAULT;
-#else
-    Properties[EL_CUSTOM_START + i][EP_BITFIELD_BASE] = EP_BITMASK_DEFAULT;
-#endif
+      Properties[element][j] = EP_BITMASK_DEFAULT;
   }
 
   BorderElement = EL_STEELWALL;

diff --git a/src/main.h b/src/main.h
index d3ae1526b1be073701b55fa49b571639ea8c251c..54340c1fda9da59d7c0be45eb1ae59cb69d3aa8f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1014,6 +1014,8 @@ struct CustomElementChangeInfo
 {
   unsigned long events;        /* bitfield for change events */
 
+  short gfx_element;   /* optional custom graphic element */
+
   short successor;     /* new custom element after change */
 
   int delay_fixed;     /* added frame delay before changed (fixed) */

diff --git a/src/tools.c b/src/tools.c
index 31a555d67a2177b7fdc186f9dbe3989ed44f5829..3961f93dde442a06bf93e2259a5a2fc0ceafd2ec 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -2392,11 +2392,17 @@ int el_act_dir2img(int element, int action, int direction)
 {
   direction = MV_DIR_BIT(direction);
 
+  if (IS_CUSTOM_ELEMENT(element))
+    element = CUSTOM_ELEMENT_INFO(element).change.gfx_element;
+
   return element_info[element].direction_graphic[action][direction];
 }
 
 int el_act2img(int element, int action)
 {
+  if (IS_CUSTOM_ELEMENT(element))
+    element = CUSTOM_ELEMENT_INFO(element).change.gfx_element;
+
   return element_info[element].graphic[action];
 }
 
@@ -2407,15 +2413,24 @@ int el_dir2img(int element, int direction)
 
 int el2img(int element)
 {
+  if (IS_CUSTOM_ELEMENT(element))
+    element = CUSTOM_ELEMENT_INFO(element).change.gfx_element;
+
   return element_info[element].graphic[ACTION_DEFAULT];
 }
 
 int el2edimg(int element)
 {
+  if (IS_CUSTOM_ELEMENT(element))
+    element = CUSTOM_ELEMENT_INFO(element).change.gfx_element;
+
   return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
 }
 
 int el2preimg(int element)
 {
+  if (IS_CUSTOM_ELEMENT(element))
+    element = CUSTOM_ELEMENT_INFO(element).change.gfx_element;
+
   return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
 }