#define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \
ED_ELEMENTLIST_BUTTONS_VERT)
+/* standard distances */
+#define ED_BORDER_SIZE 3
+#define ED_BORDER2_SIZE 5
+#define ED_GADGET_DISTANCE 2
+
/* values for the setting windows */
-#define ED_SETTINGS_XPOS (MINI_TILEX + 8)
-#define ED_SETTINGS_XPOS2 (3 * MINI_TILEX + 8)
-#define ED_SETTINGS_YPOS MINI_TILEY
+#define ED_SETTINGS_XSTART (3 * MINI_TILEX / 2)
+#define ED_SETTINGS_YSTART (MINI_TILEY * 10)
+
+#define ED_SETTINGS_XOFFSET (ED_CHECKBUTTON_XSIZE + \
+ 2 * ED_GADGET_DISTANCE)
+#define ED_SETTINGS_YOFFSET (3 * MINI_TILEY / 2)
+
+#define ED_SETTINGS_XPOS(n) (ED_SETTINGS_XSTART + \
+ n * ED_SETTINGS_XOFFSET)
+#define ED_SETTINGS_YPOS(n) (ED_SETTINGS_YSTART + \
+ n * ED_SETTINGS_YOFFSET)
+
+#define ED_SETTINGS1_YPOS MINI_TILEY
#define ED_SETTINGS2_XPOS MINI_TILEX
-#define ED_SETTINGS2_YPOS (ED_SETTINGS_YPOS + 12 * TILEY - 2)
+#define ED_SETTINGS2_YPOS (ED_SETTINGS1_YPOS + 12 * TILEY - 2)
/* values for counter gadgets */
-#define ED_COUNT_ELEMENT_SCORE_XPOS ED_SETTINGS_XPOS
-#define ED_COUNT_ELEMENT_SCORE_YPOS (11 * MINI_TILEY)
-#define ED_COUNT_ELEMENT_CONTENT_XPOS ED_SETTINGS_XPOS
-#define ED_COUNT_ELEMENT_CONTENT_YPOS (19 * MINI_TILEY)
+#define ED_COUNT_ELEMENT_SCORE_XPOS ED_SETTINGS_XPOS(0)
+#define ED_COUNT_ELEMENT_SCORE_YPOS ED_SETTINGS_YPOS(0)
+#define ED_COUNT_ELEMENT_CONTENT_XPOS ED_SETTINGS_XPOS(0)
+#define ED_COUNT_ELEMENT_CONTENT_YPOS ED_SETTINGS_YPOS(6)
-#define ED_COUNT_CHANGE_DELAY_XPOS (ED_SETTINGS_XPOS2 + 9 * MINI_TILEX)
+#define ED_COUNT_CHANGE_DELAY_XPOS (ED_SETTINGS_XPOS(1) + 9 * MINI_TILEX)
-#define ED_COUNT_CHANGE_DELAY_XPOS (ED_SETTINGS_XPOS2 + 9 * MINI_TILEX)
-
-#define ED_COUNTER_YSTART (ED_SETTINGS_YPOS + 2 * TILEY)
+#define ED_COUNTER_YSTART (ED_SETTINGS1_YPOS + 2 * TILEY)
#define ED_COUNTER_YDISTANCE (3 * MINI_TILEY)
#define ED_COUNTER_YPOS(n) (ED_COUNTER_YSTART + \
n * ED_COUNTER_YDISTANCE)
-#define ED_COUNTER_YPOS2(n) (ED_COUNTER_YSTART + \
- n * ED_COUNTER_YDISTANCE / 2)
#define ED_COUNTER2_YPOS(n) (ED_COUNTER_YSTART + \
n * ED_COUNTER_YDISTANCE - 2)
-/* standard distances */
-#define ED_BORDER_SIZE 3
-#define ED_BORDER2_SIZE 5
-#define ED_GADGET_DISTANCE 2
-
/* values for element content drawing areas */
#define ED_AREA_ELEM_CONTENT_XPOS ( 2 * MINI_TILEX)
#define ED_AREA_ELEM_CONTENT_YPOS (22 * MINI_TILEY)
#define ED_AREA_ELEM_CONTENT2_XPOS (20 * MINI_TILEX)
-#define ED_AREA_ELEM_CONTENT2_YPOS (ED_COUNTER_YPOS2(5) + \
+#define ED_AREA_ELEM_CONTENT2_YPOS (ED_SETTINGS_YPOS(1) + \
ED_GADGET_DISTANCE)
#define ED_AREA_ELEM_CONTENT3_XPOS (24 * MINI_TILEX)
-#define ED_AREA_ELEM_CONTENT3_YPOS (ED_COUNTER_YPOS2(6) + \
+#define ED_AREA_ELEM_CONTENT3_YPOS (ED_SETTINGS_YPOS(2) + \
ED_GADGET_DISTANCE)
+#define ED_AREA_ELEM_CONTENT4_XPOS (17 * MINI_TILEX)
+#define ED_AREA_ELEM_CONTENT4_YPOS (ED_SETTINGS_YPOS(8) + \
+ ED_GADGET_DISTANCE - MINI_TILEY)
+
/* values for random placement background drawing area */
#define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX)
#define ED_AREA_RANDOM_BACKGROUND_YPOS (31 * MINI_TILEY)
#define ED_SELECTBOX_XSIZE ED_WIN_COUNT_XSIZE
#define ED_SELECTBOX_YSIZE ED_WIN_COUNT_YSIZE
-#define ED_SELECTBOX_CHANGE_UNITS_XPOS (ED_SETTINGS_XPOS2 + \
- ED_CHECKBUTTON_XSIZE + \
- 2 * ED_GADGET_DISTANCE)
-
#define ED_TEXTBUTTON_XPOS ED_WIN_COUNT_XPOS
#define ED_TEXTBUTTON_YPOS (ED_WIN_COUNT_YPOS + \
+ 4 * (2 + ED_WIN_COUNT_YSIZE))
+#define ED_TEXTBUTTON_INACTIVE_YPOS ED_TEXTBUTTON_YPOS
+
+#define ED_TEXTBUTTON_TAB_XPOS ED_WIN_COUNT_XPOS
+#define ED_TEXTBUTTON_TAB_YPOS (ED_WIN_COUNT_YPOS + \
2 * (2 + ED_WIN_COUNT_YSIZE))
-#define ED_TEXTBUTTON_INACTIVE_YPOS (ED_WIN_COUNT_YPOS + \
+#define ED_TEXTBUTTON_TAB_INACTIVE_YPOS (ED_WIN_COUNT_YPOS + \
3 * (2 + ED_WIN_COUNT_YSIZE))
+
#define ED_TEXTBUTTON_XSIZE ED_WIN_COUNT_XSIZE
#define ED_TEXTBUTTON_YSIZE ED_WIN_COUNT_YSIZE
#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_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)
+#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 11)
+#define GADGET_ID_CUSTOM_CHANGED (GADGET_ID_DRAWING_AREA_FIRST + 12)
+#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 13)
/* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 13)
+#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 14)
#define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0)
#define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1)
/* selectbox identifiers */
#define GADGET_ID_SELECTBOX_FIRST (GADGET_ID_TEXT_INPUT_FIRST + 2)
-#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 0)
-#define GADGET_ID_CHANGE_CAUSE (GADGET_ID_SELECTBOX_FIRST + 1)
+#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 0)
+#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 1)
+#define GADGET_ID_CUSTOM_WALKABLE_LAYER (GADGET_ID_SELECTBOX_FIRST + 2)
+#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 3)
+#define GADGET_ID_CHANGE_CAUSE (GADGET_ID_SELECTBOX_FIRST + 4)
/* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 2)
+#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 5)
#define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0)
#define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1)
#define GADGET_ID_PROPERTIES_ADVANCED (GADGET_ID_TEXTBUTTON_FIRST + 2)
+#define GADGET_ID_SAVE_AS_TEMPLATE (GADGET_ID_TEXTBUTTON_FIRST + 3)
/* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_TEXTBUTTON_FIRST + 3)
+#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_TEXTBUTTON_FIRST + 4)
#define GADGET_ID_SCROLL_UP (GADGET_ID_SCROLLING_FIRST + 0)
#define GADGET_ID_SCROLL_DOWN (GADGET_ID_SCROLLING_FIRST + 1)
#define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 5)
#define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 6)
#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_CUSTOM_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_CUSTOM_COLLECTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_CUSTOM_PUSHABLE (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_CUSTOM_WALKABLE_OVER (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_CUSTOM_WALKABLE_INSIDE (GADGET_ID_CHECKBUTTON_FIRST+ 16)
-#define GADGET_ID_CUSTOM_WALKABLE_UNDER (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_CUSTOM_CHANGEABLE (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_CHANGE_DELAY_FIXED (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_CHANGE_DELAY_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 21)
+#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 8)
+#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 9)
+#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 10)
+#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 11)
+#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 12)
+#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 13)
+#define GADGET_ID_CUSTOM_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 14)
+#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 15)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 16)
+#define GADGET_ID_CUSTOM_CHANGEABLE (GADGET_ID_CHECKBUTTON_FIRST + 17)
+#define GADGET_ID_CHANGE_DELAY_FIXED (GADGET_ID_CHECKBUTTON_FIRST + 18)
+#define GADGET_ID_CHANGE_DELAY_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 19)
/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 20)
#define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \
ED_NUM_ELEMENTLIST_BUTTONS - 1)
#define ED_TEXTINPUT_ID_LEVEL_LAST ED_TEXTINPUT_ID_LEVEL_AUTHOR
/* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 0
-#define ED_SELECTBOX_ID_CHANGE_CAUSE 1
+#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 0
+#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 1
+#define ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER 2
+#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 3
+#define ED_SELECTBOX_ID_CHANGE_CAUSE 4
+
+#define ED_NUM_SELECTBOX 5
-#define ED_NUM_SELECTBOX 2
+#define ED_SELECTBOX_ID_CUSTOM_FIRST ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
+#define ED_SELECTBOX_ID_CUSTOM_LAST ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER
#define ED_SELECTBOX_ID_CHANGE_FIRST ED_SELECTBOX_ID_CHANGE_TIME_UNITS
#define ED_SELECTBOX_ID_CHANGE_LAST ED_SELECTBOX_ID_CHANGE_CAUSE
#define ED_TEXTBUTTON_ID_PROPERTIES_INFO 0
#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG 1
#define ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED 2
+#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE 3
-#define ED_NUM_TEXTBUTTON 3
+#define ED_NUM_TEXTBUTTON 4
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0
#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_DIGGABLE 6
-#define ED_CHECKBUTTON_ID_CUSTOM_COLLECTIBLE 7
-#define ED_CHECKBUTTON_ID_CUSTOM_PUSHABLE 8
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 9
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 10
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 11
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 12
-#define ED_CHECKBUTTON_ID_CUSTOM_WALKABLE_OVER 13
-#define ED_CHECKBUTTON_ID_CUSTOM_WALKABLE_INSIDE 14
-#define ED_CHECKBUTTON_ID_CUSTOM_WALKABLE_UNDER 15
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 16
-#define ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE 17
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY_FIXED 18
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY_RANDOM 19
-
-#define ED_NUM_CHECKBUTTONS 20
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 6
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 7
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 8
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 9
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 10
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 11
+#define ED_CHECKBUTTON_ID_CUSTOM_WALKABLE 12
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 13
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 14
+#define ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE 15
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY_FIXED 16
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY_RANDOM 17
+
+#define ED_NUM_CHECKBUTTONS 18
#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_USE_GRAPHIC
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE
#define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE
#define ED_CHECKBUTTON_ID_CHANGE_LAST ED_CHECKBUTTON_ID_CHANGE_DELAY_RANDOM
NULL, NULL
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(2),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(2),
MIN_LEV_FIELDX, MAX_LEV_FIELDX,
GADGET_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP,
GADGET_ID_LEVEL_XSIZE_TEXT,
"playfield size", "width",
},
{
- ED_SETTINGS_XPOS + 2 * DXSIZE, ED_COUNTER_YPOS(2),
+ ED_SETTINGS_XPOS(0) + 2 * DXSIZE, ED_COUNTER_YPOS(2),
MIN_LEV_FIELDY, MAX_LEV_FIELDY,
GADGET_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP,
GADGET_ID_LEVEL_YSIZE_TEXT,
NULL, "height",
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(3),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(3),
0, 999,
GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP,
GADGET_ID_LEVEL_COLLECT_TEXT,
"number of emeralds to collect", NULL
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(4),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4),
0, 999,
GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP,
GADGET_ID_LEVEL_TIMELIMIT_TEXT,
"time available to solve level", "(0 => no time limit)"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(5),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(5),
0, 255,
GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP,
GADGET_ID_LEVEL_TIMESCORE_TEXT,
"score for each 10 seconds left", NULL
},
{
- ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(8),
+ ED_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(8),
1, 100,
GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP,
GADGET_ID_LEVEL_RANDOM_TEXT,
MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS,
GADGET_ID_ELEMENT_CONTENT_DOWN, GADGET_ID_ELEMENT_CONTENT_UP,
GADGET_ID_ELEMENT_CONTENT_TEXT,
- &level.num_yam_contents,
+ &level.num_yamyam_contents,
"element content", NULL
},
{
- ED_COUNT_CHANGE_DELAY_XPOS, ED_COUNTER_YPOS2(6),
+ ED_COUNT_CHANGE_DELAY_XPOS, ED_SETTINGS_YPOS(2),
0, 999,
GADGET_ID_CHANGE_DELAY_FIX_DOWN, GADGET_ID_CHANGE_DELAY_FIX_UP,
GADGET_ID_CHANGE_DELAY_FIX_TEXT,
NULL, "units (fixed)"
},
{
- ED_COUNT_CHANGE_DELAY_XPOS, ED_COUNTER_YPOS2(7),
+ ED_COUNT_CHANGE_DELAY_XPOS, ED_SETTINGS_YPOS(3),
0, 999,
GADGET_ID_CHANGE_DELAY_RND_DOWN, GADGET_ID_CHANGE_DELAY_RND_UP,
GADGET_ID_CHANGE_DELAY_RND_TEXT,
} textinput_info[ED_NUM_TEXTINPUT] =
{
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(0),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(0),
GADGET_ID_LEVEL_NAME,
MAX_LEVEL_NAME_LEN,
level.name,
"Title"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(1),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(1),
GADGET_ID_LEVEL_AUTHOR,
MAX_LEVEL_AUTHOR_LEN,
level.author,
}
};
-static struct ValueTextInfo options_change_time_units[] =
+static struct ValueTextInfo options_walk_to_action[] =
{
- { 50, "seconds" },
- { 1, "frames" },
- { -1, NULL }
+ { EP_DIGGABLE, "diggable" },
+ { EP_COLLECTIBLE, "collectible" },
+ { EP_PUSHABLE, "pushable" },
+ { -1, NULL }
};
-static int index_change_time_units = 0;
+static int index_walk_to_action = 0;
+
+static struct ValueTextInfo options_move_direction[] =
+{
+ { MV_BIT_LEFT, "left" },
+ { MV_BIT_RIGHT, "right" },
+ { MV_BIT_UP, "up" },
+ { MV_BIT_DOWN, "down" },
+ { MV_BIT_HORIZONTAL, "horizontal" },
+ { MV_BIT_VERTICAL, "vertical" },
+ { MV_BIT_ALL_DIRECTIONS, "all directions" },
+ { MV_BIT_TOWARDS_PLAYER, "towards player" },
+ { MV_BIT_AWAY_FROM_PLAYER, "away from player" },
+ { MV_BIT_ALONG_LEFT_SIDE, "along left side" },
+ { MV_BIT_ALONG_RIGHT_SIDE, "along right side" },
+ { -1, NULL }
+};
+static int index_move_direction = 0;
+
+static struct ValueTextInfo options_walkable_layer[] =
+{
+ { EP_WALKABLE_OVER, "over" },
+ { EP_WALKABLE_INSIDE, "inside" },
+ { EP_WALKABLE_UNDER, "under" },
+ { -1, NULL }
+};
+static int index_walkable_layer = 0;
+
+static struct ValueTextInfo options_time_units[] =
+{
+ { 50, "seconds" },
+ { 1, "frames" },
+ { -1, NULL }
+};
+static int index_time_units = 0;
static struct ValueTextInfo options_change_cause[] =
{
- { 1, "specified delay" },
- { 2, "impact (active)" },
- { 3, "impact (passive)" },
- { 4, "touched by player" },
- { 5, "pressed by player" },
- { -1, NULL }
+ { 1, "specified delay" },
+ { 2, "impact (active)" },
+ { 3, "impact (passive)" },
+ { 4, "touched by player" },
+ { 5, "pressed by player" },
+ { -1, NULL }
};
static int index_change_cause = 0, value_change_cause = 0;
{
int x, y;
int gadget_id;
- int size; /* size of selectbox (chars) or '0' (dynamically determined) */
+ int size; /* char size of selectbox or '-1' (dynamically determined) */
struct ValueTextInfo *options;
int *index, *value;
char *text, *infotext;
} selectbox_info[ED_NUM_SELECTBOX] =
{
{
- ED_SELECTBOX_CHANGE_UNITS_XPOS, ED_COUNTER_YPOS2(8),
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(4),
+ GADGET_ID_CUSTOM_WALK_TO_ACTION,
+ -1,
+ options_walk_to_action, &index_walk_to_action,
+ &custom_element.walk_to_action,
+ NULL, "diggable/collectible/pushable"
+ },
+ {
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(5),
+ GADGET_ID_CUSTOM_MOVE_DIRECTION,
+ -1,
+ options_move_direction, &index_move_direction,
+ &custom_element.move_direction,
+ "can move", "element move direction"
+ },
+ {
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(10),
+ GADGET_ID_CUSTOM_WALKABLE_LAYER,
+ -1,
+ options_walkable_layer, &index_walkable_layer,
+ &custom_element.walkable_layer,
+ "player can walk", "layer where player can walk"
+ },
+ {
+ ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(4),
GADGET_ID_CHANGE_TIME_UNITS,
- 0,
- options_change_time_units, &index_change_time_units,
+ -1,
+ options_time_units, &index_time_units,
&custom_element.change.delay_frames,
- "delay units given in", "time units for change"
+ "delay time given in", "delay time units for change"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(8),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(8),
GADGET_ID_CHANGE_CAUSE,
- 0,
+ -1,
options_change_cause, &index_change_cause,
&value_change_cause,
"test:", "test-selectbox entry"
int x, y;
int gadget_id;
int size;
- char *value;
- char *infotext;
+ char *text, *infotext;
} textbutton_info[ED_NUM_TEXTBUTTON] =
{
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(1),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(1),
GADGET_ID_PROPERTIES_INFO,
- 11, "Information",
- "Show information about element"
+ 11, "Information", "Show information about element"
},
{
- ED_SETTINGS_XPOS + 166, ED_COUNTER_YPOS(1),
+ ED_SETTINGS_XPOS(0) + 166, ED_COUNTER_YPOS(1),
GADGET_ID_PROPERTIES_CONFIG,
- 11, "Configure",
- "Configure element properties"
+ 11, "Configure", "Configure element properties"
},
{
- ED_SETTINGS_XPOS + 332, ED_COUNTER_YPOS(1),
+ ED_SETTINGS_XPOS(0) + 332, ED_COUNTER_YPOS(1),
GADGET_ID_PROPERTIES_ADVANCED,
- 11, "Advanced",
- "Advanced element configuration"
+ 11, "Advanced", "Advanced element configuration"
+ },
+ {
+ ED_SETTINGS_XPOS(0) + 262, ED_SETTINGS_YPOS(11),
+ GADGET_ID_SAVE_AS_TEMPLATE,
+ -1, "Save as template", "Save current settings as new template"
},
};
static struct
{
- int xpos, ypos;
+ int gd_x, gd_y;
int x, y;
int gadget_id;
char *infotext;
static struct
{
- int xpos, ypos;
+ int gd_x, gd_y;
int x, y;
int width, height;
int type;
} radiobutton_info[ED_NUM_RADIOBUTTONS] =
{
{
- ED_SETTINGS_XPOS + 160, ED_COUNTER2_YPOS(8),
+ ED_SETTINGS_XPOS(0) + 160, ED_COUNTER2_YPOS(8),
GADGET_ID_RANDOM_PERCENTAGE,
RADIO_NR_RANDOM_ELEMENTS,
&random_placement_method, RANDOM_USE_PERCENTAGE,
"percentage", "use percentage for random elements"
},
{
- ED_SETTINGS_XPOS + 340, ED_COUNTER2_YPOS(8),
+ ED_SETTINGS_XPOS(0) + 340, ED_COUNTER2_YPOS(8),
GADGET_ID_RANDOM_QUANTITY,
RADIO_NR_RANDOM_ELEMENTS,
&random_placement_method, RANDOM_USE_QUANTITY,
} checkbutton_info[ED_NUM_CHECKBUTTONS] =
{
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(6) - MINI_TILEY,
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(6) - MINI_TILEY,
GADGET_ID_DOUBLE_SPEED,
&level.double_speed,
"double speed movement", "set movement speed of player"
},
{
- ED_SETTINGS_XPOS + 340, ED_COUNTER_YPOS(6) - MINI_TILEY,
+ ED_SETTINGS_XPOS(0) + 340, ED_COUNTER_YPOS(6) - MINI_TILEY,
GADGET_ID_GRAVITY,
&level.gravity,
"gravity", "set level gravity"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(9) - MINI_TILEY,
+ ED_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(9) - MINI_TILEY,
GADGET_ID_RANDOM_RESTRICTED,
&random_placement_background_restricted,
"restrict random placement to", "set random placement restriction"
},
{
- ED_SETTINGS_XPOS, 0, /* set at runtime */
+ ED_SETTINGS_XPOS(0), 0, /* set at runtime */
GADGET_ID_STICK_ELEMENT,
&stick_element_properties_window,
"stick this screen to edit content","stick this screen to edit content"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS(4),
+ ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4),
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_YPOS2(7),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(3),
GADGET_ID_CUSTOM_INDESTRUCTIBLE,
&custom_element_properties[EP_INDESTRUCTIBLE],
"indestructible", "element cannot be destroyed"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(8),
- GADGET_ID_CUSTOM_DIGGABLE,
- &custom_element_properties[EP_DIGGABLE],
- "diggable", "element can be digged away"
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(4),
+ GADGET_ID_CUSTOM_WALK_TO_OBJECT,
+ &custom_element_properties[EP_WALK_TO_OBJECT],
+ NULL, "player can dig/collect/push element"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(9),
- GADGET_ID_CUSTOM_COLLECTIBLE,
- &custom_element_properties[EP_COLLECTIBLE],
- "collectible", "element can be collected"
- },
- {
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(10),
- GADGET_ID_CUSTOM_PUSHABLE,
- &custom_element_properties[EP_PUSHABLE],
- "pushable", "element can be pushed"
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(5),
+ GADGET_ID_CUSTOM_CAN_MOVE,
+ &custom_element_properties[EP_CAN_MOVE],
+ NULL, "element can move in some direction"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(11),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(6),
GADGET_ID_CUSTOM_CAN_FALL,
&custom_element_properties[EP_CAN_FALL],
"can fall", "element can fall down"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(12),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(7),
GADGET_ID_CUSTOM_CAN_SMASH,
&custom_element_properties[EP_CAN_SMASH],
"can smash", "element can smash other elements"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(13),
- GADGET_ID_CUSTOM_CAN_MOVE,
- &custom_element_properties[EP_CAN_MOVE],
- "can move", "element can move in some direction"
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(8),
+ GADGET_ID_CUSTOM_CAN_EXPLODE,
+ &custom_element_properties[EP_CAN_EXPLODE],
+ "can explode to:", "element can explode to other elements"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(14),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(9),
GADGET_ID_CUSTOM_SLIPPERY,
&custom_element_properties[EP_SLIPPERY],
"slippery", "other elements can fall down from it"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(15),
- GADGET_ID_CUSTOM_WALKABLE_OVER,
- &custom_element_properties[EP_WALKABLE_OVER],
- "player can walk over", "player can walk over this element"
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(10),
+ GADGET_ID_CUSTOM_WALKABLE,
+ &custom_element_properties[EP_WALKABLE],
+ NULL, "player can walk on the same field"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(16),
- GADGET_ID_CUSTOM_WALKABLE_INSIDE,
- &custom_element_properties[EP_WALKABLE_INSIDE],
- "player can walk inside", "player can walk inside this element"
- },
- {
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(17),
- GADGET_ID_CUSTOM_WALKABLE_UNDER,
- &custom_element_properties[EP_WALKABLE_UNDER],
- "player can walk under", "player can walk under this element"
- },
- {
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(6),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2),
GADGET_ID_CUSTOM_USE_GRAPHIC,
&custom_element.use_gfx_element,
- "use graphic of element:", "use optional custom graphic element"
+ "use graphic of element:", "use graphic for custom element"
+ },
+ {
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(11),
+ GADGET_ID_CUSTOM_USE_TEMPLATE,
+ &custom_element.use_template,
+ "use template", "use template for custom properties"
},
{
- ED_SETTINGS_XPOS, ED_COUNTER_YPOS2(5),
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1),
GADGET_ID_CUSTOM_CHANGEABLE,
&custom_element_properties[EP_CHANGEABLE],
"element changes to after:", "element can change to other element"
},
{
- ED_SETTINGS_XPOS2, ED_COUNTER_YPOS2(6),
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(2),
GADGET_ID_CHANGE_DELAY_FIXED,
&custom_element_change_events[CE_DELAY_FIXED],
"delay of", "element changes after fixed delay"
},
{
- ED_SETTINGS_XPOS2, ED_COUNTER_YPOS2(7),
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3),
GADGET_ID_CHANGE_DELAY_RANDOM,
&custom_element_change_events[CE_DELAY_RANDOM],
"delay of", "element changes after random delay"
static boolean draw_with_brush = FALSE;
static int properties_element = 0;
-static short ElementContent[MAX_ELEMENT_CONTENTS][3][3];
static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static int undo_buffer_position = 0;
y += DY;
width = ED_SCROLLBUTTON2_XSIZE;
height = ED_SCROLLBUTTON2_YSIZE;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
- gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].gd_x;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].gd_y;
gd_x2 = gd_x1 - ED_SCROLLBUTTON2_XSIZE;
gd_y2 = gd_y1;
}
y += SY;
width = ED_SCROLLBUTTON_XSIZE;
height = ED_SCROLLBUTTON_YSIZE;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
- gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].gd_x;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].gd_y;
gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
gd_y2 = gd_y1;
}
xpos += 2 * ED_GADGET_DISTANCE;
ypos += ED_GADGET_DISTANCE;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].xpos;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].gd_x;
gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
- gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[sid].ypos;
+ gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[sid].gd_y;
x_size = ED_SCROLLBUTTON_XSIZE;
y_size = ED_SCROLLBUTTON_YSIZE;
}
level_editor_gadget[id] = gi;
+ /* ... one areas for custom element explosion content ... */
+ id = GADGET_ID_CUSTOM_CONTENT;
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_X, SX + ED_AREA_ELEM_CONTENT4_XPOS,
+ GDI_Y, SX + ED_AREA_ELEM_CONTENT4_YPOS,
+ GDI_WIDTH, 3 * MINI_TILEX,
+ GDI_HEIGHT, 3 * MINI_TILEY,
+ GDI_TYPE, GD_TYPE_DRAWING_AREA,
+ GDI_ITEM_SIZE, MINI_TILEX, MINI_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,
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
- int xoffset;
+ int xoffset = 0;
struct GadgetInfo *gi;
unsigned long event_mask;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = selectbox_info[i].gadget_id;
- /* (we cannot use -1 for uninitialized values if we directly compare
- with results from strlen(), because the '<' and '>' operation will
- implicitely cast -1 to an unsigned integer value!) */
+ if (selectbox_info[i].size == -1) /* dynamically determine size */
+ {
+ /* (we cannot use -1 for uninitialized values if we directly compare
+ with results from strlen(), because the '<' and '>' operation will
+ implicitely cast -1 to an unsigned integer value!) */
+ selectbox_info[i].size = 0;
- if (selectbox_info[i].size == 0) /* dynamically determined */
for (j=0; selectbox_info[i].options[j].text != NULL; j++)
if (strlen(selectbox_info[i].options[j].text) > selectbox_info[i].size)
selectbox_info[i].size = strlen(selectbox_info[i].options[j].text);
+ selectbox_info[i].size++; /* add one character empty space */
+ }
+
event_mask = GD_EVENT_RELEASED |
GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
- xoffset = (getFontWidth(FONT_TEXT_1) * strlen(selectbox_info[i].text) +
- 2 * ED_GADGET_DISTANCE);
+ /* determine horizontal offset for leading selectbox text */
+ if (selectbox_info[i].text != NULL)
+ xoffset = (getFontWidth(FONT_TEXT_1) * strlen(selectbox_info[i].text) +
+ 2 * ED_GADGET_DISTANCE);
sprintf(infotext, "Select %s", selectbox_info[i].infotext);
infotext[max_infotext_len] = '\0';
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textbutton_info[i].gadget_id;
+ if (textbutton_info[i].size == -1) /* dynamically determine size */
+ textbutton_info[i].size = strlen(textbutton_info[i].text);
+
event_mask = GD_EVENT_RELEASED;
- gd_x1 = DOOR_GFX_PAGEX4 + ED_TEXTBUTTON_XPOS;
- gd_x2 = DOOR_GFX_PAGEX3 + ED_TEXTBUTTON_XPOS;
- gd_y1 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_YPOS;
- gd_y2 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_INACTIVE_YPOS;
+ if (id >= GADGET_ID_PROPERTIES_INFO && id <= GADGET_ID_PROPERTIES_ADVANCED)
+ {
+ gd_x1 = DOOR_GFX_PAGEX4 + ED_TEXTBUTTON_TAB_XPOS;
+ gd_x2 = DOOR_GFX_PAGEX3 + ED_TEXTBUTTON_TAB_XPOS;
+ gd_y1 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_TAB_YPOS;
+ gd_y2 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_TAB_INACTIVE_YPOS;
+ }
+ else
+ {
+ gd_x1 = DOOR_GFX_PAGEX4 + ED_TEXTBUTTON_XPOS;
+ gd_x2 = DOOR_GFX_PAGEX3 + ED_TEXTBUTTON_XPOS;
+ gd_y1 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_YPOS;
+ gd_y2 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_INACTIVE_YPOS;
+ }
sprintf(infotext, "%s", textbutton_info[i].infotext);
infotext[max_infotext_len] = '\0';
GDI_X, SX + textbutton_info[i].x,
GDI_Y, SY + textbutton_info[i].y,
GDI_TYPE, GD_TYPE_TEXT_BUTTON,
- GDI_TEXT_VALUE, textbutton_info[i].value,
+ GDI_TEXT_VALUE, textbutton_info[i].text,
GDI_TEXT_SIZE, textbutton_info[i].size,
GDI_TEXT_FONT, FONT_INPUT_2_ACTIVE,
GDI_TEXT_FONT_ACTIVE, FONT_INPUT_2,
event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].xpos;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].gd_x;
gd_x2 = (gd_x1 - (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL ?
scrollbar_info[i].height : scrollbar_info[i].width));
- gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
- gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].gd_y;
+ gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].gd_y;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
for (i=0; i < NUM_CHANGE_EVENTS; i++)
custom_element_change_events[i] = HAS_CHANGE_EVENT(element, i);
+
+ /* set walk-to-object action selectbox help value */
+ custom_element.walk_to_action =
+ (IS_DIGGABLE(element) ? EP_DIGGABLE :
+ IS_COLLECTIBLE(element) ? EP_COLLECTIBLE :
+ IS_PUSHABLE(element) ? EP_PUSHABLE :
+ EP_DIGGABLE);
+
+ /* set walkable layer selectbox help value */
+ custom_element.walkable_layer =
+ (IS_WALKABLE_OVER(element) ? EP_WALKABLE_OVER :
+ IS_WALKABLE_INSIDE(element) ? EP_WALKABLE_INSIDE :
+ IS_WALKABLE_UNDER(element) ? EP_WALKABLE_UNDER :
+ EP_WALKABLE_OVER);
}
static void CopyCustomElementPropertiesToGame(int element)
i = properties_element - EL_CUSTOM_START;
level.custom_element[i] = custom_element;
+ /* set walk-to-object property from checkbox and selectbox */
+ custom_element_properties[EP_DIGGABLE] = FALSE;
+ custom_element_properties[EP_COLLECTIBLE] = FALSE;
+ custom_element_properties[EP_PUSHABLE] = FALSE;
+ custom_element_properties[custom_element.walk_to_action] =
+ custom_element_properties[EP_WALK_TO_OBJECT];
+
+ /* set walkable property from checkbox and selectbox */
+ custom_element_properties[EP_WALKABLE_OVER] = FALSE;
+ custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
+ custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
+ custom_element_properties[custom_element.walkable_layer] =
+ custom_element_properties[EP_WALKABLE];
+
for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
SET_PROPERTY(element, i, custom_element_properties[i]);
redraw_mask |= REDRAW_DOOR_1;
}
+static void RedrawDrawingElements()
+{
+ PickDrawingElement(1, new_element1);
+ PickDrawingElement(2, new_element2);
+ PickDrawingElement(3, new_element3);
+}
+
static void DrawDrawingWindow()
{
+ stick_element_properties_window = FALSE;
+
SetMainBackgroundImage(IMG_UNDEFINED);
ClearWindow();
UnmapLevelEditorWindowGadgets();
int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS;
int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS;
- ElementContent[0][0][0] = random_placement_background_element;
-
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
- DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
+ DrawMiniElement(area_x, area_y, random_placement_background_element);
MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
}
int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE);
int xoffset_right = getCounterGadgetWidth();
int yoffset_right = ED_BORDER_SIZE;
- int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+ int xoffset_right2 = ED_SETTINGS_XOFFSET;
int yoffset_right2 = ED_BORDER_SIZE;
int i, x, y;
+ stick_element_properties_window = FALSE;
+
SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
ClearWindow();
UnmapLevelEditorWindowGadgets();
- DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
+ DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS1_YPOS,
"Level Settings", FONT_TITLE_1);
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
"Editor Settings", FONT_TITLE_1);
int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
- ElementContent[0][0][0] = level.amoeba_content;
-
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
- DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
+ DrawMiniElement(area_x, area_y, level.amoeba_content);
DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1);
{
struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_GRAPHIC];
#if 0
- int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+ int xoffset_right2 = ED_SETTINGS_XOFFSET;
int yoffset_right2 = ED_BORDER_SIZE;
int i = ED_CHECKBUTTON_ID_CUSTOM_GRAPHIC;
int text_len = strlen(checkbutton_info[i].text);
int xpos = ED_AREA_ELEM_CONTENT3_XPOS;
int ypos = ED_AREA_ELEM_CONTENT3_YPOS;
#endif
- int area_x = xpos / MINI_TILEX;
- int area_y = ypos / MINI_TILEY;
int area_sx = SX + xpos;
int area_sy = SY + ypos;
return;
}
- ElementContent[0][0][0] = custom_element.gfx_element;
-
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
-#if 1
- DrawMiniGraphicExt(drawto,
- gi->x,
- gi->y,
- el2edimg(ElementContent[0][0][0]));
-#else
- DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
-#endif
-
-#if 0
- DrawText(area_sx + TILEX, area_sy + 1, "Element after change", FONT_TEXT_1);
-#endif
+ DrawMiniGraphicExt(drawto, gi->x, gi->y,
+ el2edimg(custom_element.gfx_element));
MapDrawingArea(GADGET_ID_CUSTOM_GRAPHIC);
}
+static void DrawCustomContentArea()
+{
+ struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CONTENT];
+ int area_sx = SX + ED_AREA_ELEM_CONTENT4_XPOS;
+ int area_sy = SY + ED_AREA_ELEM_CONTENT4_YPOS;
+ int x, y;
+
+ if (!IS_CUSTOM_ELEMENT(properties_element))
+ {
+ /* this should never happen */
+ Error(ERR_WARN, "element %d is no custom element", properties_element);
+
+ return;
+ }
+
+ DrawElementBorder(area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
+
+ for (y=0; y<3; y++)
+ for (x=0; x<3; x++)
+ DrawMiniGraphicExt(drawto, gi->x + x * MINI_TILEX,gi->y + y * MINI_TILEY,
+ el2edimg(custom_element.content[x][y]));
+
+ MapDrawingArea(GADGET_ID_CUSTOM_CONTENT);
+}
+
static void DrawCustomChangedArea()
{
struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGED];
#if 0
- int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+ int xoffset_right2 = ED_SETTINGS_XOFFSET;
int yoffset_right2 = ED_BORDER_SIZE;
int i = ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE;
int text_len = strlen(checkbutton_info[i].text);
int xpos = ED_AREA_ELEM_CONTENT2_XPOS;
int ypos = ED_AREA_ELEM_CONTENT2_YPOS;
#endif
- int area_x = xpos / MINI_TILEX;
- int area_y = ypos / MINI_TILEY;
int area_sx = SX + xpos;
int area_sy = SY + ypos;
return;
}
- ElementContent[0][0][0] = custom_element.change.successor;
-
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
-#if 1
- DrawMiniGraphicExt(drawto,
- gi->x,
- gi->y,
- el2edimg(ElementContent[0][0][0]));
-#else
- DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
-#endif
-
-#if 0
- DrawText(area_sx + TILEX, area_sy + 1, "Element after change", FONT_TEXT_1);
-#endif
+ DrawMiniGraphicExt(drawto, gi->x, gi->y,
+ el2edimg(custom_element.change.successor));
MapDrawingArea(GADGET_ID_CUSTOM_CHANGED);
}
int yoffset_right = ED_BORDER_SIZE;
int i, x, y;
- for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
- for (y=0; y<3; y++)
- for (x=0; x<3; x++)
- ElementContent[i][x][y] = level.yam_content[i][x][y];
-
for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
UnmapDrawingArea(GADGET_ID_ELEMENT_CONTENT_0 + i);
/* delete content areas in case of reducing number of them */
DrawBackground(SX, area_sy - MINI_TILEX, SXSIZE, 12 * MINI_TILEY);
- for (i=0; i<level.num_yam_contents; i++)
+ for (i=0; i<level.num_yamyam_contents; i++)
DrawElementBorder(area_sx + 5 * (i % 4) * MINI_TILEX,
area_sy + 6 * (i / 4) * MINI_TILEY,
3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
"smashed", FONT_TEXT_1);
- for (i=0; i<level.num_yam_contents; i++)
+ for (i=0; i<level.num_yamyam_contents; i++)
{
for (y=0; y<3; y++)
for (x=0; x<3; x++)
DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
- ElementContent[i][x][y]);
+ level.yamyam_content[i][x][y]);
DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
area_sy - SY + 6 * (i / 4) * MINI_TILEY + 4 * MINI_TILEY - 4,
FONT_TEXT_1, "%d", i + 1);
}
- for (i=0; i<level.num_yam_contents; i++)
+ for (i=0; i<level.num_yamyam_contents; i++)
MapDrawingArea(GADGET_ID_ELEMENT_CONTENT_0 + i);
}
static boolean PrintInfoText(char *text, int font_nr, int screen_line)
{
int font_height = getFontHeight(font_nr);
- int pad_x = ED_SETTINGS_XPOS;
- int pad_y = 5 * TILEY;
+ int pad_x = ED_SETTINGS_XPOS(0);
+ int pad_y = ED_SETTINGS_YPOS(0);
int sx = SX + pad_x;
int sy = SY + pad_y;
int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
{
int font_nr = FONT_TEXT_2;
int font_width = getFontWidth(font_nr);
- int pad_x = ED_SETTINGS_XPOS;
+ int pad_x = ED_SETTINGS_XPOS(0);
int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
char line[MAX_LINE_LEN];
char buffer[max_chars_per_line + 1];
int font2_nr = FONT_TEXT_2;
int font1_width = getFontWidth(font1_nr);
int font2_height = getFontHeight(font2_nr);
- int pad_x = ED_SETTINGS_XPOS;
- int pad_y = 5 * TILEY;
- int screen_line = 2;
+ int pad_x = ED_SETTINGS_XPOS(0);
+ int pad_y = ED_SETTINGS_YPOS(0);
+ int screen_line = 0;
int i, x, y;
+ /* ----- print number of elements / percentage of this element in level */
+
num_elements_in_level = 0;
for (y=0; y<lev_fieldy; y++)
for (x=0; x<lev_fieldx; x++)
num_elements_in_level++;
percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
- DrawTextF(pad_x, pad_y, font1_nr, percentage_text);
- DrawTextF(pad_x + strlen(percentage_text) * font1_width, pad_y,
- font2_nr, "%d (%.2f%%)", num_elements_in_level, percentage);
+ DrawTextF(pad_x, pad_y + screen_line * font2_height, font1_nr,
+ percentage_text);
+ DrawTextF(pad_x + strlen(percentage_text) * font1_width,
+ pad_y + screen_line++ * font2_height, font2_nr,
+ "%d (%.2f%%)", num_elements_in_level, percentage);
- for (i=0; properties[i].value != -1; i++)
- if (HAS_PROPERTY(properties_element, properties[i].value))
- num_standard_properties++;
+ screen_line++;
-#if 1
- if (num_standard_properties > 0)
- {
- DrawTextF(pad_x, pad_y + screen_line * font2_height, font1_nr,
- properties_text);
- screen_line++;
+ /* ----- print standard properties of this element */
- for (i=0; properties[i].value != -1; i++)
- {
- if (!HAS_PROPERTY(properties_element, properties[i].value))
- continue;
+ DrawTextF(pad_x, pad_y + screen_line++ * font2_height, font1_nr,
+ properties_text);
- DrawTextF(pad_x, pad_y + screen_line * font2_height, font2_nr,
- properties[i].text);
- screen_line++;
- }
+ for (i=0; properties[i].value != -1; i++)
+ {
+ if (!HAS_PROPERTY(properties_element, properties[i].value))
+ continue;
- screen_line++;
+ DrawTextF(pad_x, pad_y + screen_line++ * font2_height, font2_nr,
+ properties[i].text);
+ num_standard_properties++;
}
-#endif
+
+ if (num_standard_properties == 0)
+ DrawTextF(pad_x + strlen(properties_text) * font1_width,
+ pad_y + (screen_line - 1) * font2_height, font2_nr, "none");
+
+ screen_line++;
+
+ /* ----- print special description of this element */
PrintInfoText("Description:", FONT_TEXT_1, screen_line);
if (PrintElementDescriptionFromFile(filename, screen_line + 1) == 0)
{ EL_EMERALD_YELLOW, &level.score[SC_EMERALD], TEXT_COLLECTING },
{ EL_EMERALD_RED, &level.score[SC_EMERALD], TEXT_COLLECTING },
{ EL_EMERALD_PURPLE, &level.score[SC_EMERALD], TEXT_COLLECTING },
+ { EL_SP_INFOTRON, &level.score[SC_EMERALD], TEXT_COLLECTING },
{ EL_DIAMOND, &level.score[SC_DIAMOND], TEXT_COLLECTING },
+ { EL_CRYSTAL, &level.score[SC_CRYSTAL], TEXT_COLLECTING },
+ { EL_PEARL, &level.score[SC_PEARL], TEXT_COLLECTING },
{ EL_BUG_RIGHT, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_BUG_UP, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_BUG_LEFT, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_BD_BUTTERFLY_UP, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_BD_BUTTERFLY_LEFT, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_BD_BUTTERFLY_DOWN, &level.score[SC_BUG], TEXT_SMASHING },
+ { EL_SP_ELECTRON, &level.score[SC_BUG], TEXT_SMASHING },
{ EL_SPACESHIP_RIGHT, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_SPACESHIP_UP, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_SPACESHIP_LEFT, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_BD_FIREFLY_UP, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_BD_FIREFLY_LEFT, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_BD_FIREFLY_DOWN, &level.score[SC_SPACESHIP], TEXT_SMASHING },
+ { EL_SP_SNIKSNAK, &level.score[SC_SPACESHIP], TEXT_SMASHING },
{ EL_YAMYAM, &level.score[SC_YAMYAM], TEXT_SMASHING },
{ EL_DARK_YAMYAM, &level.score[SC_YAMYAM], TEXT_SMASHING },
{ EL_ROBOT, &level.score[SC_ROBOT], TEXT_SMASHING },
{ EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING },
{ EL_NUT, &level.score[SC_NUT], TEXT_CRACKING },
{ EL_DYNAMITE, &level.score[SC_DYNAMITE], TEXT_COLLECTING },
+ { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE],TEXT_COLLECTING },
+ { EL_DYNABOMB_INCREASE_SIZE, &level.score[SC_DYNAMITE],TEXT_COLLECTING },
+ { EL_DYNABOMB_INCREASE_POWER, &level.score[SC_DYNAMITE],TEXT_COLLECTING },
+ { EL_SHIELD_NORMAL, &level.score[SC_SHIELD], TEXT_COLLECTING },
+ { EL_SHIELD_DEADLY, &level.score[SC_SHIELD], TEXT_COLLECTING },
+ { EL_EXTRA_TIME, &level.score[SC_TIME_BONUS], TEXT_COLLECTING },
{ EL_KEY_1, &level.score[SC_KEY], TEXT_COLLECTING },
{ EL_KEY_2, &level.score[SC_KEY], TEXT_COLLECTING },
{ EL_KEY_3, &level.score[SC_KEY], TEXT_COLLECTING },
int counter_id = ED_COUNTER_ID_ELEMENT_SCORE;
int xoffset_right = getCounterGadgetWidth();
int yoffset_right = ED_BORDER_SIZE;
- int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+ int xoffset_right2 = ED_SETTINGS_XOFFSET;
int yoffset_right2 = ED_BORDER_SIZE;
int i, x, y;
if (HAS_CONTENT(properties_element))
checkbutton_info[i].y = ED_COUNTER_YPOS(4);
else
- checkbutton_info[i].y = ED_COUNTER_YPOS2(5);
+ checkbutton_info[i].y = ED_SETTINGS_YPOS(1);
x = checkbutton_info[i].x + xoffset_right2;
y = checkbutton_info[i].y + yoffset_right2;
MapCheckbuttonGadget(i);
if (IS_CUSTOM_ELEMENT(properties_element))
+ {
DrawCustomGraphicElementArea();
+ DrawCustomContentArea();
+ }
else if (IS_AMOEBOID(properties_element))
DrawAmoebaContentArea();
else
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
}
+
+ /* draw selectbox gadgets */
+ for (i=ED_SELECTBOX_ID_CUSTOM_FIRST; i <= ED_SELECTBOX_ID_CUSTOM_LAST; i++)
+ {
+ int yoffset = ED_BORDER_SIZE;
+
+ x = selectbox_info[i].x;
+ y = selectbox_info[i].y + yoffset;
+
+ DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
+ ModifyEditorSelectbox(i, *selectbox_info[i].value);
+ MapSelectboxGadget(i);
+ }
+
+ /* draw textbutton gadgets */
+ MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
}
}
int max_infotext_len = getMaxInfoTextLength();
int xoffset_right = getCounterGadgetWidth();
int yoffset_right = ED_BORDER_SIZE;
- int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+ int xoffset_right2 = ED_SETTINGS_XOFFSET;
int yoffset_right2 = ED_BORDER_SIZE;
int i, x, y;
/* draw stickybutton gadget */
i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
- checkbutton_info[i].y = ED_COUNTER_YPOS2(4);
+ checkbutton_info[i].y = ED_SETTINGS_YPOS(0);
x = checkbutton_info[i].x + xoffset_right2;
y = checkbutton_info[i].y + yoffset_right2;
y = selectbox_info[i].y + yoffset;
DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
-#if 1
ModifyEditorSelectbox(i, *selectbox_info[i].value);
-#else
- ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
- GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
-#endif
MapSelectboxGadget(i);
}
int xstart = 2;
int ystart = 4;
+ stick_element_properties_window = FALSE;
+
/* make sure that previous properties edit mode exists for this element */
if (edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED &&
!IS_CUSTOM_ELEMENT(properties_element))
SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
ClearWindow();
- DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
+ DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS1_YPOS,
"Element Settings", FONT_TITLE_1);
DrawElementBorder(SX + xstart * MINI_TILEX,
/* automatically switch to 'single item' drawing mode, if needed */
actual_drawing_function =
- (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
+ (draw_level || drawing_function == GADGET_ID_PICK_ELEMENT ?
+ drawing_function : GADGET_ID_SINGLE_ITEMS);
switch (actual_drawing_function)
{
level.custom_element[i] = custom_element;
ModifyEditorElementList();
+ RedrawDrawingElements();
FrameCounter = 0; /* restart animation frame counter */
}
+ else if (id == GADGET_ID_CUSTOM_CONTENT)
+ {
+ int i = properties_element - EL_CUSTOM_START;
+
+ custom_element.content[sx][sy] = new_element;
+ level.custom_element[i] = custom_element;
+ }
else if (id == GADGET_ID_CUSTOM_CHANGED)
{
int i = properties_element - EL_CUSTOM_START;
random_placement_background_element = new_element;
else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
id <= GADGET_ID_ELEMENT_CONTENT_7)
- level.yam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy] =
+ level.yamyam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy] =
new_element;
}
break;
if (button_release_event)
ClickOnGadget(level_editor_gadget[last_drawing_function],
MB_LEFTBUTTON);
- else
+ else if (draw_level)
PickDrawingElement(button, Feld[lx][ly]);
+ else if (id == GADGET_ID_AMOEBA_CONTENT)
+ PickDrawingElement(button, level.amoeba_content);
+ else if (id == GADGET_ID_CUSTOM_GRAPHIC)
+ PickDrawingElement(button, custom_element.gfx_element);
+ else if (id == GADGET_ID_CUSTOM_CONTENT)
+ PickDrawingElement(button, custom_element.content[sx][sy]);
+ else if (id == GADGET_ID_CUSTOM_CHANGED)
+ PickDrawingElement(button, custom_element.change.successor);
+ else if (id == GADGET_ID_RANDOM_BACKGROUND)
+ PickDrawingElement(button, random_placement_background_element);
+ else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
+ id <= GADGET_ID_ELEMENT_CONTENT_7)
+ {
+ int i = id - GADGET_ID_ELEMENT_CONTENT_0;
+
+ PickDrawingElement(button, level.yamyam_content[i][sx][sy]);
+ }
break;
*selectbox_info[type_id].value =
selectbox_info[type_id].options[gi->selectbox.index].value;
- if (type_id >= ED_SELECTBOX_ID_CHANGE_FIRST &&
- type_id <= ED_SELECTBOX_ID_CHANGE_LAST)
+ if ((type_id >= ED_SELECTBOX_ID_CUSTOM_FIRST &&
+ type_id <= ED_SELECTBOX_ID_CUSTOM_LAST) ||
+ (type_id >= ED_SELECTBOX_ID_CHANGE_FIRST &&
+ type_id <= ED_SELECTBOX_ID_CHANGE_LAST))
CopyCustomElementPropertiesToGame(properties_element);
#if 0
CopyCustomElementPropertiesToGame(properties_element);
if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC)
+ {
ModifyEditorElementList();
+ RedrawDrawingElements();
+ }
}
static void HandleControlButtons(struct GadgetInfo *gi)
DrawLevelText(0, 0, 0, TEXT_END);
if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES &&
- edit_mode != ED_MODE_DRAWING)
+ id != GADGET_ID_PICK_ELEMENT && edit_mode != ED_MODE_DRAWING &&
+ drawing_function != GADGET_ID_PICK_ELEMENT)
{
DrawDrawingWindow();
edit_mode = ED_MODE_DRAWING;
PickDrawingElement(button, new_element);
-#if 1
- if (!stick_element_properties_window)
-#else
- if (!HAS_CONTENT(properties_element) ||
- !stick_element_properties_window)
-#endif
+ if (!stick_element_properties_window &&
+ drawing_function != GADGET_ID_PICK_ELEMENT)
{
properties_element = new_element;
if (edit_mode == ED_MODE_PROPERTIES)
DeleteBrushFromCursor();
}
}
- 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");
- else if (id == GADGET_ID_RANDOM_BACKGROUND)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
- "Random placement background");
+ else if (drawing_function == GADGET_ID_PICK_ELEMENT)
+ {
+ if (id == GADGET_ID_AMOEBA_CONTENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(level.amoeba_content));
+ else if (id == GADGET_ID_CUSTOM_GRAPHIC)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(custom_element.use_gfx_element));
+ else if (id == GADGET_ID_CUSTOM_CONTENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(custom_element.content[sx][sy]));
+ else if (id == GADGET_ID_CUSTOM_CHANGED)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(custom_element.change.successor));
+ else if (id == GADGET_ID_RANDOM_BACKGROUND)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(random_placement_background_element));
+ else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
+ id <= GADGET_ID_ELEMENT_CONTENT_7)
+ {
+ int i = id - GADGET_ID_ELEMENT_CONTENT_0;
+
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "%s", getElementInfoText(level.yamyam_content[i][sx][sy]));
+ }
+ }
else
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
- "Content area %d position: %d, %d",
- id - GADGET_ID_ELEMENT_CONTENT_0 + 1, sx, sy);
+ {
+ 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,
+ "Custom graphic element");
+ else if (id == GADGET_ID_CUSTOM_CONTENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "Custom element content position: %d, %d", sx, sy);
+ else if (id == GADGET_ID_CUSTOM_CHANGED)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "New element after change");
+ else if (id == GADGET_ID_RANDOM_BACKGROUND)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "Random placement background");
+ else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
+ id <= GADGET_ID_ELEMENT_CONTENT_7)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "Content area %d position: %d, %d",
+ id - GADGET_ID_ELEMENT_CONTENT_0 + 1, sx, sy);
+ }
}
void RequestExitLevelEditor(boolean ask_if_level_has_changed)
projects / rocksndiamonds.git / blobdiff