rnd-20030426-1-src

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index df3db706e31ba03f7fce6d18943144d25ba9631d..b028364fdeb4131f8755da432c750dca8b8f3439 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -3406,8 +3406,10 @@ static void DrawPropertiesConfig()
       else
        DrawElementContentAreas();
     }
+#if 1
     else if (IS_CUSTOM_ELEMENT(properties_element))
       DrawCustomChangedArea();
+#endif
   }
 
   if (IS_GEM(properties_element))
@@ -3440,6 +3442,7 @@ static void DrawPropertiesConfig()
       MapCheckbuttonGadget(i);
     }
 
+#if 1
     /* draw selectbox gadget */
     i = ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE;
     x = selectbox_info[i].x + xoffset_right2;
@@ -3451,6 +3454,7 @@ static void DrawPropertiesConfig()
     ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
                 GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
     MapSelectboxGadget(i);
+#endif
   }
 }
 
@@ -3637,7 +3641,7 @@ static void DrawPropertiesTabulatorGadgets()
   struct GadgetDesign *gd = &gd_gi->alt_design[GD_BUTTON_UNPRESSED];
   int gd_x = gd->x + gd_gi->border.width / 2;
   int gd_y = gd->y + gd_gi->height - 1;
-  Pixel line_color = GetPixel(gd->bitmap, gd_x, gd_y);
+  Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
   int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
   int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
   int i;
@@ -3655,19 +3659,23 @@ static void DrawPropertiesTabulatorGadgets()
     int gadget_id = textbutton_info[i].gadget_id;
     struct GadgetInfo *gi = level_editor_gadget[gadget_id];
     boolean active = (i != edit_mode_properties);
-    Pixel color = (active ? BLACK_PIXEL : line_color);
 
-    /* draw solid or black line below tabulator button */
-    FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width, 1, color);
+    /* draw background line below tabulator button */
+    ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width,1);
+
+    /* draw solid line below inactive tabulator buttons */
+    if (!active && tab_color != BLACK_PIXEL)   /* black => transparent */
+      FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,1, tab_color);
 
     ModifyGadget(gi, GDI_ACTIVE, active, GDI_END);
     MapTextbuttonGadget(i);
   }
 
   /* draw little border line below tabulator buttons */
-  FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1,
-               3 * gd_gi->width + 2 * ED_GADGET_DISTANCE, ED_GADGET_DISTANCE,
-               line_color);
+  if (tab_color != BLACK_PIXEL)                        /* black => transparent */
+    FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1,
+                 3 * gd_gi->width + 2 * ED_GADGET_DISTANCE,
+                 ED_GADGET_DISTANCE, tab_color);
 }
 
 static void DrawPropertiesInfo()
@@ -3681,12 +3689,9 @@ static void DrawPropertiesInfo()
   {
     { EP_AMOEBALIVE,           "- living amoeba"               },
     { EP_AMOEBOID,             "- amoeboid"                    },
-    { EP_PFORTE,               "- pforte"                      },
-    { EP_SOLID,                        "- solid"                       },
     { EP_INDESTRUCTIBLE,       "- undestructible"              },
     { EP_SLIPPERY,             "- slippery"                    },
     { EP_ENEMY,                        "- enemy"                       },
-    { EP_MAUER,                        "- mauer"                       },
     { EP_CAN_FALL,             "- can fall"                    },
     { EP_CAN_SMASH,            "- can smash"                   },
     { EP_CAN_CHANGE,           "- can change"                  },
@@ -3706,8 +3711,7 @@ static void DrawPropertiesInfo()
     { EP_HAS_CONTENT,          "- has content"                 },
     { EP_DIGGABLE,             "- diggable"                    },
     { EP_SP_ELEMENT,           "- SB style"                    },
-    { EP_WALKABLE_THROUGH,     "- walkable through"            },
-    { EP_OVER_PLAYER,          "- over player"                 },
+    { EP_WALKABLE_INSIDE,      "- walkable inside"             },
     { EP_ACTIVE_BOMB,          "- active bomb"                 },
     { EP_BELT,                 "- belt"                        },
     { EP_BELT_ACTIVE,          "- active belt"                 },
@@ -3747,6 +3751,7 @@ static void DrawPropertiesInfo()
     if (HAS_PROPERTY(properties_element, properties[i].value))
       num_standard_properties++;
 
+#if 1
   if (num_standard_properties > 0)
   {
     DrawTextF(pad_x, pad_y + screen_line * font2_height, font1_nr,
@@ -3765,6 +3770,7 @@ static void DrawPropertiesInfo()
 
     screen_line++;
   }
+#endif
 
   PrintInfoText("Description:", FONT_TEXT_1, screen_line);
   if (PrintElementDescriptionFromFile(filename, screen_line + 1) == 0)
@@ -3773,7 +3779,8 @@ static void DrawPropertiesInfo()
 
 static void DrawPropertiesAdvanced()
 {
-  DrawText(SX + ED_SETTINGS_XPOS, SY + 5 * TILEY, "Coming soon!", FONT_TEXT_1);
+  DrawText(SX + ED_SETTINGS_XPOS, SY + 5 * TILEY,
+          "Under construction! :-)", FONT_TEXT_1);
 }
 
 static void DrawPropertiesWindow()