X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=87184cd88820a0be03ce083009a8f5b696f79bbe;hb=ddaae9de458b7f07b05461101655a1da4c63b380;hp=b7fc8bd49f1cf0c52f5cf4419c1eaada5d2c817d;hpb=732fd648f26b307fa3ab0e2c44ec06eb28d6f0d6;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index b7fc8bd4..87184cd8 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -237,6 +237,8 @@
 #define ED_SELECTBOX_XSIZE		ED_WIN_COUNT_XSIZE
 #define ED_SELECTBOX_YSIZE		ED_WIN_COUNT_YSIZE
 
+#define ED_SELECTBOX_BUTTON_XSIZE	14
+
 #define ED_TEXTBUTTON_XPOS		ED_WIN_COUNT_XPOS
 #define ED_TEXTBUTTON_YPOS		(ED_WIN_COUNT_YPOS + \
 					 4 * (2 + ED_WIN_COUNT_YSIZE))
@@ -888,7 +890,7 @@ static struct
     GADGET_ID_CHANGE_CONT_RND_DOWN,	GADGET_ID_CHANGE_CONT_RND_UP,
     GADGET_ID_CHANGE_CONT_RND_TEXT,	GADGET_ID_NONE,
     &custom_element.change.random,
-    NULL,				"use random change:", NULL
+    NULL,				"use random change:", "(%)"
   },
 };
 
@@ -1361,7 +1363,7 @@ static struct
   {
     ED_SETTINGS_XPOS(0) + 340,		ED_COUNTER_YPOS(6) - MINI_TILEY,
     GADGET_ID_GRAVITY,			GADGET_ID_DOUBLE_SPEED,
-    &level.gravity,
+    &level.initial_gravity,
     " ", "gravity",			"set level gravity"
   },
   {
@@ -1798,7 +1800,7 @@ static int editor_el_emerald_mine[] =
 
   EL_STEELWALL,
   EL_WALL,
-  EL_WALL_CRUMBLED,
+  EL_WALL_SLIPPERY,
   EL_MAGIC_WALL,
 
   EL_EMERALD,
@@ -2119,7 +2121,7 @@ static int editor_el_diamond_caves[] =
 
   EL_LANDMINE,
   EL_INVISIBLE_SAND,
-  EL_STEELWALL_SLANTED,
+  EL_STEELWALL_SLIPPERY,
   EL_EMPTY,
 
   EL_SIGN_EXCLAMATION,
@@ -3156,7 +3158,7 @@ static void CreateSelectboxGadgets()
 		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
 		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
 		      GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE,
-		      GDI_BORDER_SIZE_SELECTBUTTON, getFontWidth(FONT_INPUT_1),
+		      GDI_BORDER_SIZE_SELECTBUTTON, ED_SELECTBOX_BUTTON_XSIZE,
 		      GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
 		      GDI_EVENT_MASK, event_mask,
 		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
@@ -4789,9 +4791,13 @@ static void DrawPropertiesInfo()
   properties[] =
   {
     /* configurable properties */
-    { EP_INDESTRUCTIBLE,	"- undestructible"			},
-    { EP_SLIPPERY,		"- slippery for falling objects"	},
-    { EP_EM_SLIPPERY_WALL,	"- slippery for some gems (EM style)"	},
+
+    { EP_WALKABLE_OVER,		"- player can walk over it"		},
+    { EP_WALKABLE_INSIDE,	"- player can walk inside it"		},
+    { EP_WALKABLE_UNDER,	"- player can walk under it"		},
+    { EP_PASSABLE_OVER,		"- player can pass over it"		},
+    { EP_PASSABLE_INSIDE,	"- player can pass through it"		},
+    { EP_PASSABLE_UNDER,	"- player can pass under it"		},
 
     { EP_DIGGABLE,		"- diggable"				},
     { EP_COLLECTIBLE,		"- collectible"				},
@@ -4799,27 +4805,27 @@ static void DrawPropertiesInfo()
 
     { EP_CAN_MOVE,		"- can move"				},
     { EP_CAN_FALL,		"- can fall"				},
-#if 0
-    { EP_CAN_SMASH,		"- can smash"				},
-#endif
+
     { EP_CAN_SMASH_PLAYER,	"- can smash player"			},
+#if 0
     { EP_CAN_SMASH_ENEMIES,	"- can smash good and bad guys"		},
+#endif
     { EP_CAN_SMASH_EVERYTHING,	"- can smash everything smashable"	},
-    { EP_CAN_EXPLODE,		"- can explode"				},
-    { EP_CAN_EXPLODE_BY_FIRE,	"  - by fire or explosions"		},
-    { EP_CAN_EXPLODE_SMASHED,	"  - when smashed"			},
-    { EP_CAN_EXPLODE_IMPACT,	"  - on impact"				},
+
+    { EP_SLIPPERY,		"- slippery for falling objects"	},
+    { EP_EM_SLIPPERY_WALL,	"- slippery for some gems (EM style)"	},
 
     { EP_DONT_RUN_INTO,		"- deadly when running into"		},
     { EP_DONT_COLLIDE_WITH,	"- deadly when colliding with"		},
     { EP_DONT_TOUCH,		"- deadly when touching"		},
 
-    { EP_WALKABLE_OVER,		"- player can walk over it"		},
-    { EP_WALKABLE_INSIDE,	"- player can walk inside it"		},
-    { EP_WALKABLE_UNDER,	"- player can walk under it"		},
-    { EP_PASSABLE_OVER,		"- player can pass over it"		},
-    { EP_PASSABLE_INSIDE,	"- player can pass through it"		},
-    { EP_PASSABLE_UNDER,	"- player can pass under it"		},
+    { EP_INDESTRUCTIBLE,	"- undestructible"			},
+
+    { EP_CAN_EXPLODE_BY_FIRE,	"- can explode by fire or explosions"	},
+    { EP_CAN_EXPLODE_SMASHED,	"- can explode when smashed"		},
+    { EP_CAN_EXPLODE_IMPACT,	"- can explode on impact"		},
+
+    { EP_CAN_CHANGE,		"- can change to other element"		},
 
     /* pre-defined properties */
     { EP_CAN_PASS_MAGIC_WALL,	"- can pass magic walls"		},