#include "tools.h"
#include "files.h"
#include "game.h"
+#include "init.h"
#include "tape.h"
#define ED_AREA_ELEM_CONTENT4_YPOS (ED_SETTINGS_YPOS(12) + \
ED_GADGET_DISTANCE - MINI_TILEY)
/* custom change trigger element */
-#define ED_AREA_ELEM_CONTENT5_XPOS (30 * MINI_TILEX + MINI_TILEX / 2)
+#define ED_AREA_ELEM_CONTENT5_XPOS (28 * MINI_TILEX)
#define ED_AREA_ELEM_CONTENT5_YPOS (ED_SETTINGS_YPOS(7) + \
ED_GADGET_DISTANCE)
+/* extended custom change target */
+#define ED_AREA_ELEM_CONTENT6_XPOS (29 * MINI_TILEX)
+#define ED_AREA_ELEM_CONTENT6_YPOS (ED_SETTINGS_YPOS(10) + \
+ ED_GADGET_DISTANCE - MINI_TILEY)
/* values for random placement background drawing area */
#define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX)
#define GADGET_ID_LEVEL_RANDOM_DOWN (GADGET_ID_COUNTER_FIRST + 9)
#define GADGET_ID_LEVEL_RANDOM_TEXT (GADGET_ID_COUNTER_FIRST + 10)
#define GADGET_ID_LEVEL_RANDOM_UP (GADGET_ID_COUNTER_FIRST + 11)
-#define GADGET_ID_LEVEL_COLLECT_DOWN (GADGET_ID_COUNTER_FIRST + 12)
-#define GADGET_ID_LEVEL_COLLECT_TEXT (GADGET_ID_COUNTER_FIRST + 13)
-#define GADGET_ID_LEVEL_COLLECT_UP (GADGET_ID_COUNTER_FIRST + 14)
+#define GADGET_ID_LEVEL_GEMSLIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 12)
+#define GADGET_ID_LEVEL_GEMSLIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 13)
+#define GADGET_ID_LEVEL_GEMSLIMIT_UP (GADGET_ID_COUNTER_FIRST + 14)
#define GADGET_ID_LEVEL_TIMELIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 15)
#define GADGET_ID_LEVEL_TIMELIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 16)
#define GADGET_ID_LEVEL_TIMELIMIT_UP (GADGET_ID_COUNTER_FIRST + 17)
#define GADGET_ID_ELEMENT_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 24)
#define GADGET_ID_ELEMENT_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 25)
#define GADGET_ID_ELEMENT_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 26)
-#define GADGET_ID_COLLECT_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 27)
-#define GADGET_ID_COLLECT_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 28)
-#define GADGET_ID_COLLECT_SCORE_UP (GADGET_ID_COUNTER_FIRST + 29)
-#define GADGET_ID_COLLECT_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 30)
-#define GADGET_ID_COLLECT_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 31)
-#define GADGET_ID_COLLECT_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 32)
+#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 27)
+#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 28)
+#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 29)
+#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 30)
+#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 31)
+#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 32)
#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 33)
#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 34)
#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 35)
#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 48)
#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 49)
#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 50)
+#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 51)
+#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 52)
+#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 53)
/* drawing area identifiers */
-#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 51)
+#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 54)
#define GADGET_ID_DRAWING_LEVEL (GADGET_ID_DRAWING_AREA_FIRST + 0)
#define GADGET_ID_ELEMENT_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 1)
#define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 10)
#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 11)
#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 12)
-#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 13)
-#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 14)
+#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 13)
+#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 14)
+#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 15)
/* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 15)
+#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 16)
#define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0)
#define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1)
#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 8)
#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 9)
#define GADGET_ID_CHANGE_PLAYER_ACTION (GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CHANGE_IMPACT_ACTION (GADGET_ID_SELECTBOX_FIRST + 11)
+#define GADGET_ID_CHANGE_COLLIDE_ACTION (GADGET_ID_SELECTBOX_FIRST + 11)
#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 12)
+#define GADGET_ID_CHANGE_POWER (GADGET_ID_SELECTBOX_FIRST + 13)
/* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 14)
#define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0)
#define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1)
#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 18)
#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 19)
#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_CHANGE_BY_PLAYER (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_CHANGE_IMPACT_SMASHED (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_CHANGE_BY_OTHER (GADGET_ID_CHECKBUTTON_FIRST + 24)
+#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 21)
+#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 24)
+#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 25)
+#define GADGET_ID_CHANGE_BY_PLAYER (GADGET_ID_CHECKBUTTON_FIRST + 26)
+#define GADGET_ID_CHANGE_BY_COLLISION (GADGET_ID_CHECKBUTTON_FIRST + 27)
+#define GADGET_ID_CHANGE_BY_OTHER (GADGET_ID_CHECKBUTTON_FIRST + 28)
/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 25)
+#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 29)
#define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \
ED_NUM_ELEMENTLIST_BUTTONS - 1)
#define ED_COUNTER_ID_SELECT_LEVEL 0
#define ED_COUNTER_ID_LEVEL_XSIZE 1
#define ED_COUNTER_ID_LEVEL_YSIZE 2
-#define ED_COUNTER_ID_LEVEL_COLLECT 3
+#define ED_COUNTER_ID_LEVEL_GEMSLIMIT 3
#define ED_COUNTER_ID_LEVEL_TIMELIMIT 4
#define ED_COUNTER_ID_LEVEL_TIMESCORE 5
#define ED_COUNTER_ID_LEVEL_RANDOM 6
#define ED_COUNTER_ID_ELEMENT_SCORE 7
#define ED_COUNTER_ID_ELEMENT_CONTENT 8
-#define ED_COUNTER_ID_COLLECT_SCORE 9
-#define ED_COUNTER_ID_COLLECT_GEMCOUNT 10
+#define ED_COUNTER_ID_CUSTOM_SCORE 9
+#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 10
#define ED_COUNTER_ID_PUSH_DELAY_FIX 11
#define ED_COUNTER_ID_PUSH_DELAY_RND 12
#define ED_COUNTER_ID_MOVE_DELAY_FIX 13
#define ED_COUNTER_ID_MOVE_DELAY_RND 14
#define ED_COUNTER_ID_CHANGE_DELAY_FIX 15
#define ED_COUNTER_ID_CHANGE_DELAY_RND 16
+#define ED_COUNTER_ID_CHANGE_CONT_RND 17
-#define ED_NUM_COUNTERBUTTONS 17
+#define ED_NUM_COUNTERBUTTONS 18
#define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE
#define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM
-#define ED_COUNTER_ID_CUSTOM_FIRST ED_COUNTER_ID_COLLECT_SCORE
+#define ED_COUNTER_ID_CUSTOM_FIRST ED_COUNTER_ID_CUSTOM_SCORE
#define ED_COUNTER_ID_CUSTOM_LAST ED_COUNTER_ID_MOVE_DELAY_RND
#define ED_COUNTER_ID_CHANGE_FIRST ED_COUNTER_ID_CHANGE_DELAY_FIX
-#define ED_COUNTER_ID_CHANGE_LAST ED_COUNTER_ID_CHANGE_DELAY_RND
+#define ED_COUNTER_ID_CHANGE_LAST ED_COUNTER_ID_CHANGE_CONT_RND
/* values for scrollbutton gadgets */
#define ED_SCROLLBUTTON_ID_AREA_UP 0
#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 8
#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 9
#define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION 10
-#define ED_SELECTBOX_ID_CHANGE_IMPACT_ACTION 11
+#define ED_SELECTBOX_ID_CHANGE_COLLIDE_ACTION 11
#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 12
+#define ED_SELECTBOX_ID_CHANGE_POWER 13
-#define ED_NUM_SELECTBOX 13
+#define ED_NUM_SELECTBOX 14
#define ED_SELECTBOX_ID_CUSTOM_FIRST ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
#define ED_SELECTBOX_ID_CUSTOM_LAST ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER
#define ED_SELECTBOX_ID_CHANGE_FIRST ED_SELECTBOX_ID_CHANGE_TIME_UNITS
-#define ED_SELECTBOX_ID_CHANGE_LAST ED_SELECTBOX_ID_CHANGE_OTHER_ACTION
+#define ED_SELECTBOX_ID_CHANGE_LAST ED_SELECTBOX_ID_CHANGE_POWER
/* values for textbutton gadgets */
#define ED_TEXTBUTTON_ID_PROPERTIES_INFO 0
#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 16
#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 17
#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 18
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY 19
-#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER 20
-#define ED_CHECKBUTTON_ID_CHANGE_IMPACT_SMASHED 21
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER 22
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 19
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 20
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 21
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 22
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY 23
+#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER 24
+#define ED_CHECKBUTTON_ID_CHANGE_BY_COLLISION 25
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER 26
-#define ED_NUM_CHECKBUTTONS 23
+#define ED_NUM_CHECKBUTTONS 27
#define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED
#define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
{
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,
+ GADGET_ID_LEVEL_GEMSLIMIT_DOWN, GADGET_ID_LEVEL_GEMSLIMIT_UP,
+ GADGET_ID_LEVEL_GEMSLIMIT_TEXT,
&level.gems_needed,
"number of emeralds to collect", NULL, NULL
},
{
ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3),
MIN_SCORE, MAX_SCORE,
- GADGET_ID_COLLECT_SCORE_DOWN, GADGET_ID_COLLECT_SCORE_UP,
- GADGET_ID_COLLECT_SCORE_TEXT,
- &custom_element.collect_score,
+ GADGET_ID_CUSTOM_SCORE_DOWN, GADGET_ID_CUSTOM_SCORE_UP,
+ GADGET_ID_CUSTOM_SCORE_TEXT,
+ &custom_element.score,
NULL, "collect score", NULL
},
{
ED_SETTINGS_XPOS(13) + 10, ED_SETTINGS_YPOS(3),
MIN_GEM_COUNT, MAX_GEM_COUNT,
- GADGET_ID_COLLECT_GEMCOUNT_DOWN, GADGET_ID_COLLECT_GEMCOUNT_UP,
- GADGET_ID_COLLECT_GEMCOUNT_TEXT,
- &custom_element.collect_gem_count,
+ GADGET_ID_CUSTOM_GEMCOUNT_DOWN, GADGET_ID_CUSTOM_GEMCOUNT_UP,
+ GADGET_ID_CUSTOM_GEMCOUNT_TEXT,
+ &custom_element.gem_count,
NULL, "gems", NULL
},
{
GADGET_ID_CHANGE_DELAY_RND_TEXT,
&custom_element.change.delay_random,
NULL, "+random", NULL
- }
+ },
+ {
+ ED_SETTINGS_XPOS(3), ED_SETTINGS_YPOS(12),
+ 0, 100,
+ GADGET_ID_CHANGE_CONT_RND_DOWN, GADGET_ID_CHANGE_CONT_RND_UP,
+ GADGET_ID_CHANGE_CONT_RND_TEXT,
+ &custom_element.change.random,
+ NULL, "use random change:", NULL
+ },
};
static struct
}
};
+static struct ValueTextInfo options_access_type[] =
+{
+ { EP_WALKABLE, "walk" },
+ { EP_PASSABLE, "pass" },
+ { -1, NULL }
+};
+
+static struct ValueTextInfo options_access_layer[] =
+{
+ { EP_ACCESSIBLE_OVER, "over" },
+ { EP_ACCESSIBLE_INSIDE, "inside" },
+ { EP_ACCESSIBLE_UNDER, "under" },
+ { -1, NULL }
+};
+
static struct ValueTextInfo options_walk_to_action[] =
{
{ EP_DIGGABLE, "diggable" },
{ EP_PUSHABLE, "pushable" },
{ -1, NULL }
};
-static int value_walk_to_action = 0;
static struct ValueTextInfo options_move_pattern[] =
{
{ -1, NULL }
};
-static struct ValueTextInfo options_consistency[] =
-{
- { EP_CAN_EXPLODE, "can explode" },
- { EP_INDESTRUCTIBLE, "indestructible" },
- { -1, NULL }
-};
-static int value_consistency = 0;
-
-static struct ValueTextInfo options_deadliness[] =
-{
- { EP_DONT_RUN_INTO, "running into" },
- { EP_DONT_COLLIDE_WITH, "colliding with" },
- { EP_DONT_TOUCH, "touching" },
- { -1, NULL }
-};
-static int value_deadliness = 0;
-
static struct ValueTextInfo options_smash_targets[] =
{
{ EP_CAN_SMASH_PLAYER, "player" },
{ EP_CAN_SMASH_EVERYTHING, "everything" },
{ -1, NULL }
};
-static int value_smash_targets = 0;
-static struct ValueTextInfo options_access_type[] =
+static struct ValueTextInfo options_deadliness[] =
{
- { EP_WALKABLE, "walk" },
- { EP_PASSABLE, "pass" },
+ { EP_DONT_RUN_INTO, "running into" },
+ { EP_DONT_COLLIDE_WITH, "colliding with" },
+ { EP_DONT_TOUCH, "touching" },
{ -1, NULL }
};
-static int value_access_type = 0;
-static struct ValueTextInfo options_access_layer[] =
+static struct ValueTextInfo options_consistency[] =
{
- { EP_ACCESSIBLE_OVER, "over" },
- { EP_ACCESSIBLE_INSIDE, "inside" },
- { EP_ACCESSIBLE_UNDER, "under" },
+ { EP_CAN_EXPLODE, "can explode" },
+ { EP_INDESTRUCTIBLE, "indestructible" },
{ -1, NULL }
};
-static int value_access_layer = 0;
static struct ValueTextInfo options_time_units[] =
{
{ CE_PUSHED_BY_PLAYER, "pushed" },
{ -1, NULL }
};
-static int value_change_player_action = 0;
-static struct ValueTextInfo options_change_impact_action[] =
+static struct ValueTextInfo options_change_collide_action[] =
{
+ { CE_COLLISION, "on collision" },
{ CE_IMPACT, "on impact" },
{ CE_SMASHED, "when smashed" },
{ -1, NULL }
};
-static int value_change_impact_action = 0;
static struct ValueTextInfo options_change_other_action[] =
{
- { CE_OTHER_COLLECTING, "collecting" },
- { CE_OTHER_PUSHING, "pushing" },
- { CE_OTHER_CHANGING, "change of" },
- { CE_OTHER_EXPLODING, "explosion of" },
+ { CE_OTHER_IS_TOUCHING, "touching" },
+ { CE_OTHER_IS_CHANGING, "change of" },
+ { CE_OTHER_IS_EXPLODING, "explosion of" },
+ { CE_OTHER_GETS_TOUCHED, "player touches" },
+ { CE_OTHER_GETS_PRESSED, "player presses" },
+ { CE_OTHER_GETS_PUSHED, "player pushes" },
+ { CE_OTHER_GETS_COLLECTED, "player collects" },
+ { -1, NULL }
+};
+
+static struct ValueTextInfo options_change_power[] =
+{
+ { CP_NON_DESTRUCTIVE, "non-destructive" },
+ { CP_HALF_DESTRUCTIVE, "half-destructive" },
+ { CP_FULL_DESTRUCTIVE, "full-destructive" },
{ -1, NULL }
};
-static int value_change_other_action = 0;
static struct
{
GADGET_ID_CUSTOM_ACCESS_TYPE,
-1,
options_access_type,
- &value_access_type,
+ &custom_element.access_type,
"player can", NULL, "type of access to this field"
},
{
GADGET_ID_CUSTOM_ACCESS_LAYER,
-1,
options_access_layer,
- &value_access_layer,
+ &custom_element.access_layer,
NULL, NULL, "layer of access for this field"
},
{
GADGET_ID_CUSTOM_WALK_TO_ACTION,
-1,
options_walk_to_action,
- &value_walk_to_action,
+ &custom_element.walk_to_action,
NULL, NULL, "diggable/collectible/pushable"
},
{
GADGET_ID_CUSTOM_SMASH_TARGETS,
-1,
options_smash_targets,
- &value_smash_targets,
+ &custom_element.smash_targets,
"can smash", NULL, "elements that can be smashed"
},
{
GADGET_ID_CUSTOM_DEADLINESS,
-1,
options_deadliness,
- &value_deadliness,
+ &custom_element.deadliness,
"deadly when", NULL, "deadliness of element"
},
{
GADGET_ID_CUSTOM_CONSISTENCY,
-1,
options_consistency,
- &value_consistency,
+ &custom_element.consistency,
NULL, "explodes to:", "consistency/destructibility"
},
GADGET_ID_CHANGE_PLAYER_ACTION,
-1,
options_change_player_action,
- &value_change_player_action,
+ &custom_element.change_player_action,
NULL, "by player", "type of player contact"
},
{
ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(6),
- GADGET_ID_CHANGE_IMPACT_ACTION,
+ GADGET_ID_CHANGE_COLLIDE_ACTION,
-1,
- options_change_impact_action,
- &value_change_impact_action,
+ options_change_collide_action,
+ &custom_element.change_collide_action,
NULL, NULL, "change after impact or smash"
},
{
GADGET_ID_CHANGE_OTHER_ACTION,
-1,
options_change_other_action,
- &value_change_other_action,
- NULL, "other element:", "type of other element action"
+ &custom_element.change_other_action,
+ NULL, "element:", "type of other element action"
+ },
+ {
+ ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(10),
+ GADGET_ID_CHANGE_POWER,
+ -1,
+ options_change_power,
+ &custom_element.change.power,
+ "power:", NULL, "power of extended change"
},
};
11, "Advanced", "Advanced element configuration"
},
{
- ED_SETTINGS_XPOS(0) + 262, ED_SETTINGS_YPOS(12),
+ ED_SETTINGS_XPOS(0) + 262, ED_SETTINGS_YPOS(13),
GADGET_ID_SAVE_AS_TEMPLATE,
-1, "Save as template", "Save current settings as new template"
},
{
ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_FIRE,
- &custom_element_properties[EP_CAN_EXPLODE_BY_FIRE],
+ &custom_element.can_explode_by_fire,
"by fire", "element can explode by fire/explosion"
},
{
ED_SETTINGS_XPOS(7), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_SMASH,
- &custom_element_properties[EP_CAN_EXPLODE_SMASHED],
+ &custom_element.can_explode_smashed,
"smashed", "element can explode when smashed"
},
{
ED_SETTINGS_XPOS(13), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_IMPACT,
- &custom_element_properties[EP_CAN_EXPLODE_IMPACT],
+ &custom_element.can_explode_impact,
"impact", "element can explode on impact"
},
},
{
ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(6),
- GADGET_ID_CHANGE_IMPACT_SMASHED,
- &custom_element_change_events[CE_IMPACT_SMASHED],
+ GADGET_ID_CHANGE_BY_COLLISION,
+ &custom_element_change_events[CE_BY_COLLISION],
NULL, "element changes by impact or smash"
},
{
NULL, "element changes by other element"
},
{
- ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(12),
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(8),
+ GADGET_ID_CHANGE_USE_EXPLOSION,
+ &custom_element.change.explode,
+ "explode instead of change", "element explodes instead of change"
+ },
+ {
+ ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(9),
+ GADGET_ID_CHANGE_USE_CONTENT,
+ &custom_element.change.use_content,
+ "use extended change target:", "element changes to more elements"
+ },
+ {
+ ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(11),
+ GADGET_ID_CHANGE_ONLY_COMPLETE,
+ &custom_element.change.only_complete,
+ "only use complete change", "only use complete extended content"
+ },
+ {
+ ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(12),
+ GADGET_ID_CHANGE_USE_RANDOM,
+ &custom_element.change.use_random_change,
+ NULL, "use random value for new content"
+ },
+ {
+ ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_USE_TEMPLATE,
- &custom_element.use_template,
+ &level.use_custom_template,
"use template", "use template for custom properties"
},
};
level_editor_gadget[id] = gi;
- /* ... one areas for custom element explosion content ... */
+ /* ... one area for custom element explosion content ... */
id = GADGET_ID_CUSTOM_CONTENT;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
level_editor_gadget[id] = gi;
+ /* ... one area for extended custom element change target content ... */
+ id = GADGET_ID_CUSTOM_CHANGE_CONTENT;
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_X, SX + ED_AREA_ELEM_CONTENT6_XPOS,
+ GDI_Y, SX + ED_AREA_ELEM_CONTENT6_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 trigger element ... */
id = GADGET_ID_CUSTOM_CHANGE_TRIGGER;
gi = CreateGadget(GDI_CUSTOM_ID, id,
{
int i;
+ /* needed here to initialize combined element properties */
+ InitElementPropertiesEngine(level.game_version);
+
custom_element = element_info[properties_element];
for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
for (i=0; i < NUM_CHANGE_EVENTS; i++)
custom_element_change_events[i] = HAS_CHANGE_EVENT(element, i);
+ /* ---------- element settings: configure (custom elements) ------------- */
+
+ /* set accessible layer selectbox help value */
+ custom_element.access_type =
+ (IS_WALKABLE(element) ? EP_WALKABLE :
+ IS_PASSABLE(element) ? EP_PASSABLE :
+ custom_element.access_type);
+ custom_element.access_layer =
+ (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
+ IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
+ IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
+ custom_element.access_layer);
+ custom_element_properties[EP_ACCESSIBLE] =
+ (IS_ACCESSIBLE_OVER(element) ||
+ IS_ACCESSIBLE_INSIDE(element) ||
+ IS_ACCESSIBLE_UNDER(element));
+
/* set walk-to-object action selectbox help value */
- value_walk_to_action =
+ custom_element.walk_to_action =
(IS_DIGGABLE(element) ? EP_DIGGABLE :
IS_COLLECTIBLE(element) ? EP_COLLECTIBLE :
IS_PUSHABLE(element) ? EP_PUSHABLE :
- EP_DIGGABLE);
+ custom_element.walk_to_action);
custom_element_properties[EP_WALK_TO_OBJECT] =
(IS_DIGGABLE(element) ||
IS_COLLECTIBLE(element) ||
IS_PUSHABLE(element));
- /* set consistency selectbox help value */
- value_consistency =
- (CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
- IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
- EP_CAN_EXPLODE);
- custom_element_properties[EP_EXPLODE_RESULT] =
- (CAN_EXPLODE(element) ||
- IS_INDESTRUCTIBLE(element));
+ /* set smash targets selectbox help value */
+ custom_element.smash_targets =
+ (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
+ CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
+ CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
+ custom_element.smash_targets);
+ custom_element_properties[EP_CAN_SMASH] =
+ (CAN_SMASH_EVERYTHING(element) ||
+ CAN_SMASH_ENEMIES(element) ||
+ CAN_SMASH_PLAYER(element));
/* set deadliness selectbox help value */
- value_deadliness =
+ custom_element.deadliness =
(DONT_TOUCH(element) ? EP_DONT_TOUCH :
DONT_COLLIDE_WITH(element) ? EP_DONT_COLLIDE_WITH :
DONT_RUN_INTO(element) ? EP_DONT_RUN_INTO :
- EP_DONT_RUN_INTO);
+ custom_element.deadliness);
custom_element_properties[EP_DEADLY] =
(DONT_TOUCH(element) ||
DONT_COLLIDE_WITH(element) ||
DONT_RUN_INTO(element));
- /* set smash targets selectbox help value */
- value_smash_targets =
- (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
- CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
- CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
- EP_CAN_SMASH_PLAYER);
- custom_element_properties[EP_CAN_SMASH] =
- (CAN_SMASH_EVERYTHING(element) ||
- CAN_SMASH_ENEMIES(element) ||
- CAN_SMASH_PLAYER(element));
+ /* set consistency selectbox help value */
+ custom_element.consistency =
+ (IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
+ CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
+ custom_element.consistency);
+ custom_element_properties[EP_EXPLODE_RESULT] =
+ (IS_INDESTRUCTIBLE(element) ||
+ CAN_EXPLODE(element));
- /* set accessible layer selectbox help value */
- value_access_type =
- (IS_WALKABLE(element) ? EP_WALKABLE :
- IS_PASSABLE(element) ? EP_PASSABLE :
- EP_WALKABLE);
- value_access_layer =
- (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
- IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
- IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
- EP_ACCESSIBLE_OVER);
- custom_element_properties[EP_ACCESSIBLE] =
- (IS_ACCESSIBLE_OVER(element) ||
- IS_ACCESSIBLE_INSIDE(element) ||
- IS_ACCESSIBLE_UNDER(element));
+ /* special case: sub-settings dependent from main setting */
+ if (CAN_EXPLODE_BY_FIRE(element))
+ custom_element.can_explode_by_fire = TRUE;
+ if (CAN_EXPLODE_SMASHED(element))
+ custom_element.can_explode_smashed = TRUE;
+ if (CAN_EXPLODE_IMPACT(element))
+ custom_element.can_explode_impact = TRUE;
+
+ /* ---------- element settings: advanced (custom elements) --------------- */
/* set change by player selectbox help value */
- value_change_player_action =
+ custom_element.change_player_action =
(HAS_CHANGE_EVENT(element, CE_PUSHED_BY_PLAYER) ? CE_PUSHED_BY_PLAYER :
HAS_CHANGE_EVENT(element, CE_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
- CE_PRESSED_BY_PLAYER);
+ custom_element.change_player_action);
- /* set change by impact/smash selectbox help value */
- value_change_impact_action =
+ /* set change by collision selectbox help value */
+ custom_element.change_collide_action =
(HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED :
HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT :
- CE_IMPACT);
+ HAS_CHANGE_EVENT(element, CE_COLLISION) ? CE_COLLISION :
+ custom_element.change_collide_action);
/* set change by other element action selectbox help value */
- value_change_other_action =
- (HAS_CHANGE_EVENT(element, CE_OTHER_EXPLODING) ? CE_OTHER_EXPLODING :
- HAS_CHANGE_EVENT(element, CE_OTHER_CHANGING) ? CE_OTHER_CHANGING :
- HAS_CHANGE_EVENT(element, CE_OTHER_PUSHING) ? CE_OTHER_PUSHING :
- HAS_CHANGE_EVENT(element, CE_OTHER_COLLECTING) ? CE_OTHER_COLLECTING :
- CE_OTHER_COLLECTING);
+ custom_element.change_other_action =
+ (HAS_CHANGE_EVENT(element, CE_OTHER_GETS_COLLECTED) ? CE_OTHER_GETS_COLLECTED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PUSHED) ? CE_OTHER_GETS_PUSHED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PRESSED) ? CE_OTHER_GETS_PRESSED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_TOUCHED) ? CE_OTHER_GETS_TOUCHED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_EXPLODING) ? CE_OTHER_IS_EXPLODING :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_CHANGING) ? CE_OTHER_IS_CHANGING :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_TOUCHING) ? CE_OTHER_IS_TOUCHING :
+ custom_element.change_other_action);
}
static void CopyCustomElementPropertiesToGame(int element)
{
int i;
+ int access_type_and_layer;
element_info[properties_element] = custom_element;
+ /* ---------- element settings: configure (custom elements) ------------- */
+
+ /* set accessible 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[EP_PASSABLE_OVER] = FALSE;
+ custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
+ custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
+ access_type_and_layer = ((custom_element.access_type == EP_WALKABLE ?
+ EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
+ (custom_element.access_layer - EP_ACCESSIBLE_OVER));
+ custom_element_properties[access_type_and_layer] =
+ custom_element_properties[EP_ACCESSIBLE];
+
/* 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[value_walk_to_action] =
+ custom_element_properties[custom_element.walk_to_action] =
custom_element_properties[EP_WALK_TO_OBJECT];
- /* set consistency property from checkbox and selectbox */
- custom_element_properties[EP_CAN_EXPLODE] = FALSE;
- custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
- custom_element_properties[value_consistency] =
- custom_element_properties[EP_EXPLODE_RESULT];
+ /* set smash property from checkbox and selectbox */
+ custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
+ custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
+ custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
+ custom_element_properties[custom_element.smash_targets] =
+ custom_element_properties[EP_CAN_SMASH];
/* set deadliness property from checkbox and selectbox */
custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
custom_element_properties[EP_DONT_COLLIDE_WITH] = FALSE;
custom_element_properties[EP_DONT_TOUCH] = FALSE;
- custom_element_properties[value_deadliness] =
+ custom_element_properties[custom_element.deadliness] =
custom_element_properties[EP_DEADLY];
- /* set smash property from checkbox and selectbox */
- custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
- custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
- custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
- custom_element_properties[value_smash_targets] =
- custom_element_properties[EP_CAN_SMASH];
+ /* set consistency property from checkbox and selectbox */
+ custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_SMASHED] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_IMPACT] = FALSE;
+ custom_element_properties[custom_element.consistency] =
+ custom_element_properties[EP_EXPLODE_RESULT];
- /* set accessible 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[EP_PASSABLE_OVER] = FALSE;
- custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
- custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
- custom_element_properties[((value_access_type == EP_WALKABLE ?
- EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
- (value_access_layer - EP_ACCESSIBLE_OVER))] =
- custom_element_properties[EP_ACCESSIBLE];
+ /* special case: sub-settings dependent from main setting */
+ if (custom_element_properties[EP_CAN_EXPLODE])
+ {
+ custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] =
+ custom_element.can_explode_by_fire;
+ custom_element_properties[EP_CAN_EXPLODE_SMASHED] =
+ custom_element.can_explode_smashed;
+ custom_element_properties[EP_CAN_EXPLODE_IMPACT] =
+ custom_element.can_explode_impact;
+ }
+
+ /* ---------- element settings: advanced (custom elements) --------------- */
/* set player change event from checkbox and selectbox */
custom_element_change_events[CE_TOUCHED_BY_PLAYER] = FALSE;
custom_element_change_events[CE_PRESSED_BY_PLAYER] = FALSE;
custom_element_change_events[CE_PUSHED_BY_PLAYER] = FALSE;
- custom_element_change_events[value_change_player_action] =
+ custom_element_change_events[custom_element.change_player_action] =
custom_element_change_events[CE_BY_PLAYER];
- /* set player change event from checkbox and selectbox */
+ /* set collision change event from checkbox and selectbox */
+ custom_element_change_events[CE_COLLISION] = FALSE;
custom_element_change_events[CE_IMPACT] = FALSE;
custom_element_change_events[CE_SMASHED] = FALSE;
- custom_element_change_events[value_change_impact_action] =
- custom_element_change_events[CE_IMPACT_SMASHED];
+ custom_element_change_events[custom_element.change_collide_action] =
+ custom_element_change_events[CE_BY_COLLISION];
/* set other element action change event from checkbox and selectbox */
- custom_element_change_events[CE_OTHER_COLLECTING] = FALSE;
- custom_element_change_events[CE_OTHER_PUSHING] = FALSE;
- custom_element_change_events[CE_OTHER_CHANGING] = FALSE;
- custom_element_change_events[CE_OTHER_EXPLODING] = FALSE;
- custom_element_change_events[value_change_other_action] =
+ custom_element_change_events[CE_OTHER_IS_TOUCHING] = FALSE;
+ custom_element_change_events[CE_OTHER_IS_CHANGING] = FALSE;
+ custom_element_change_events[CE_OTHER_IS_EXPLODING] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_TOUCHED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_PRESSED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_PUSHED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_COLLECTED] = FALSE;
+ custom_element_change_events[custom_element.change_other_action] =
custom_element_change_events[CE_BY_OTHER];
for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
redraw_mask |= REDRAW_ALL;
ReinitializeElementListButtons(); /* only needed after setup changes */
+ ModifyEditorElementList(); /* may be needed for custom elements */
UnmapTapeButtons();
MapControlButtons();
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
DrawMiniGraphicExt(drawto, gi->x, gi->y,
- el2edimg(custom_element.change.successor));
+ el2edimg(custom_element.change.target_element));
MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TARGET);
}
+static void DrawCustomChangeContentArea()
+{
+ struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_CONTENT];
+ int area_sx = SX + ED_AREA_ELEM_CONTENT6_XPOS;
+ int area_sy = SY + ED_AREA_ELEM_CONTENT6_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.change.content[x][y]));
+
+ MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_CONTENT);
+}
+
static void DrawCustomChangeTriggerArea()
{
struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_TRIGGER];
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
DrawMiniGraphicExt(drawto, gi->x, gi->y,
- el2edimg(custom_element.change.trigger));
+ el2edimg(custom_element.change.trigger_element));
MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TRIGGER);
}
int gd_y = gd->y + gd_gi->height - 1;
Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
-#if 1
int id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
-#else
- int id_last = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
-#endif
int i;
-#if 0
- /* draw additional "configure" tabulator for configurable elements */
- if (checkPropertiesConfig())
- id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
-#endif
-
/* draw additional "advanced" tabulator for custom elements */
if (IS_CUSTOM_ELEMENT(properties_element))
id_last = ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED;
}
}
+static void DrawPropertiesAdvancedDrawingAreas()
+{
+ DrawCustomGraphicElementArea();
+ DrawCustomChangeTargetArea();
+ DrawCustomChangeTriggerArea();
+ DrawCustomChangeContentArea();
+
+ redraw_mask |= REDRAW_FIELD;
+}
+
static void DrawPropertiesAdvanced()
{
int i;
MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
/* draw drawing area gadgets */
- DrawCustomGraphicElementArea();
- DrawCustomChangeTargetArea();
- DrawCustomChangeTriggerArea();
+ DrawPropertiesAdvancedDrawingAreas();
}
static void DrawElementName(int x, int y, int element)
!IS_CUSTOM_ELEMENT(properties_element))
edit_mode_properties = ED_MODE_PROPERTIES_CONFIG;
-#if 0
- if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG &&
- !checkPropertiesConfig())
- edit_mode_properties = ED_MODE_PROPERTIES_INFO;
-#endif
-
if (IS_CUSTOM_ELEMENT(properties_element))
CopyCustomElementPropertiesToEditor(properties_element);
}
else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
{
- custom_element.change.successor = new_element;
+ custom_element.change.target_element = new_element;
+ element_info[properties_element] = custom_element;
+ }
+ else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
+ {
+ custom_element.change.content[sx][sy] = new_element;
element_info[properties_element] = custom_element;
}
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
{
- custom_element.change.trigger = new_element;
+ custom_element.change.trigger_element = new_element;
element_info[properties_element] = custom_element;
}
else if (id == GADGET_ID_RANDOM_BACKGROUND)
else if (id == GADGET_ID_CUSTOM_CONTENT)
PickDrawingElement(button, custom_element.content[sx][sy]);
else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
- PickDrawingElement(button, custom_element.change.successor);
+ PickDrawingElement(button, custom_element.change.target_element);
+ else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
+ PickDrawingElement(button, custom_element.change.content[sx][sy]);
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
- PickDrawingElement(button, custom_element.change.trigger);
+ PickDrawingElement(button, custom_element.change.trigger_element);
else if (id == GADGET_ID_RANDOM_BACKGROUND)
PickDrawingElement(button, random_placement_background_element);
else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
{
ModifyEditorElementList();
RedrawDrawingElements();
+
+ DrawPropertiesAdvancedDrawingAreas();
}
}
else if (actual_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));
+ 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));
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(custom_element.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]));
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(custom_element.content[sx][sy]));
else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
- "%s", getElementInfoText(custom_element.change.successor));
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(custom_element.change.target_element));
+ else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(custom_element.change.content[sx][sy]));
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
- "%s", getElementInfoText(custom_element.change.trigger));
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(custom_element.change.trigger_element));
else if (id == GADGET_ID_RANDOM_BACKGROUND)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
- "%s", getElementInfoText(random_placement_background_element));
+ 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]));
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
+ getElementInfoText(level.yamyam_content[i][sx][sy]));
}
}
else
else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"New element after change");
+ else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+ "New extended elements after change");
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"Other element triggering change");
projects / rocksndiamonds.git / blobdiff