X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Feditor.c;h=86413d2724ea8173f8264a8876185831b97279a3;hb=e7791d2f4e780fc2da8abbd8b4402b5d338cc600;hp=a36f0696ce037e01e7645378bf9bba37e8928956;hpb=4add6d49e770bbdcd7dc4176fdec56d6dad16bb2;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index a36f0696..86413d27 100644 --- a/src/editor.c +++ b/src/editor.c @@ -540,43 +540,45 @@ #define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 4) #define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 5) #define GADGET_ID_USE_SPRING_BUG (GADGET_ID_CHECKBUTTON_FIRST + 6) -#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 7) -#define GADGET_ID_DOUBLE_SPEED (GADGET_ID_CHECKBUTTON_FIRST + 8) -#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 39) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_USE_TIME_ORB_BUG (GADGET_ID_CHECKBUTTON_FIRST + 7) +#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 8) +#define GADGET_ID_DOUBLE_SPEED (GADGET_ID_CHECKBUTTON_FIRST + 9) +#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 10) +#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 42) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 43) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -755,42 +757,44 @@ #define ED_CHECKBUTTON_ID_STICK_ELEMENT 2 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 3 #define ED_CHECKBUTTON_ID_USE_SPRING_BUG 4 -#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 5 -#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 6 -#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 7 -#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 8 -#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 9 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 10 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 11 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 12 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 13 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 14 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 15 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 16 -#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 17 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 18 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 19 -#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 20 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 21 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 22 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 23 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 24 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 25 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 26 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 27 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 28 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 29 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 30 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 31 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 32 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 33 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 34 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 35 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 36 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 37 -#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 38 - -#define ED_NUM_CHECKBUTTONS 39 +#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG 5 +#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 6 +#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 7 +#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 8 +#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 9 +#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 10 +#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 11 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 12 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 13 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 14 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 15 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 16 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 17 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 18 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 19 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 20 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 21 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 22 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 23 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 24 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 25 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 26 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 27 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 28 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 29 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 30 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 31 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 32 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 33 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 34 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 35 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 36 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 37 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 38 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 39 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 40 + +#define ED_NUM_CHECKBUTTONS 41 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_INITIAL_GRAVITY #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -1592,16 +1596,16 @@ static struct ValueTextInfo options_action_type[] = { CA_NO_ACTION, "no action" }, { CA_EXIT_PLAYER, "exit player" }, { CA_KILL_PLAYER, "kill player" }, + { CA_MOVE_PLAYER, "move player" }, { CA_RESTART_LEVEL, "restart level" }, { CA_SHOW_ENVELOPE, "show envelope" }, - { CA_ADD_KEY, "add key" }, - { CA_REMOVE_KEY, "remove key" }, - { CA_SET_PLAYER_SPEED, "set player speed" }, - { CA_SET_PLAYER_GRAVITY, "set gravity" }, - { CA_SET_WIND_DIRECTION, "set wind dir." }, - { CA_SET_LEVEL_GEMS, "set needed gems" }, - { CA_SET_LEVEL_TIME, "set level time" }, - { CA_SET_LEVEL_SCORE, "set level score" }, + { CA_SET_TIME, "set level time" }, + { CA_SET_GEMS, "set needed gems" }, + { CA_SET_SCORE, "set level score" }, + { CA_SET_KEYS, "set player keys" }, + { CA_SET_SPEED, "set player speed" }, + { CA_SET_GRAVITY, "set gravity" }, + { CA_SET_WIND, "set wind dir." }, { CA_SET_CE_SCORE, "set CE score" }, { CA_SET_CE_VALUE, "set CE value" }, #if 0 @@ -1620,14 +1624,22 @@ static struct ValueTextInfo options_action_mode_none[] = { -1, NULL } }; -static struct ValueTextInfo options_action_mode_set[] = +static struct ValueTextInfo options_action_mode_assign[] = { { CA_MODE_SET, "=" }, { -1, NULL } }; -static struct ValueTextInfo options_action_mode_calc[] = +static struct ValueTextInfo options_action_mode_add_remove[] = +{ + { CA_MODE_ADD, "+" }, + { CA_MODE_SUBTRACT, "-" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_mode_calculate[] = { { CA_MODE_SET, "=" }, { CA_MODE_ADD, "+" }, @@ -1727,6 +1739,7 @@ static struct ValueTextInfo options_action_arg_envelope[] = static struct ValueTextInfo options_action_arg_speed[] = { { CA_ARG_SPEED_HEADLINE, "[speed]" }, + { CA_ARG_SPEED_NOT_MOVING, "frozen" }, { CA_ARG_SPEED_VERY_SLOW, "very slow" }, { CA_ARG_SPEED_SLOW, "slow" }, { CA_ARG_SPEED_NORMAL, "normal" }, @@ -1761,6 +1774,7 @@ static struct ValueTextInfo options_action_arg_direction[] = { CA_ARG_DIRECTION_UP, "up" }, { CA_ARG_DIRECTION_DOWN, "down" }, { CA_ARG_DIRECTION_TRIGGER, "trigger" }, + { CA_ARG_DIRECTION_TRIGGER_BACK, "-trigger" }, { -1, NULL } }; @@ -1785,8 +1799,9 @@ static struct ValueTextInfo options_group_choice_mode[] = static struct ValueTextInfo *action_arg_modes[] = { options_action_mode_none, - options_action_mode_set, - options_action_mode_calc, + options_action_mode_assign, + options_action_mode_add_remove, + options_action_mode_calculate, }; static struct @@ -1800,18 +1815,18 @@ action_arg_options[] = { CA_NO_ACTION, 0, options_action_arg_none, }, { CA_EXIT_PLAYER, 0, options_action_arg_player, }, { CA_KILL_PLAYER, 0, options_action_arg_player, }, + { CA_MOVE_PLAYER, 0, options_action_arg_direction, }, { CA_RESTART_LEVEL, 0, options_action_arg_none, }, { CA_SHOW_ENVELOPE, 0, options_action_arg_envelope, }, - { CA_ADD_KEY, 0, options_action_arg_key, }, - { CA_REMOVE_KEY, 0, options_action_arg_key, }, - { CA_SET_PLAYER_SPEED, 1, options_action_arg_speed, }, - { CA_SET_LEVEL_GEMS, 2, options_action_arg_number, }, - { CA_SET_LEVEL_TIME, 2, options_action_arg_number, }, - { CA_SET_LEVEL_SCORE, 2, options_action_arg_number, }, - { CA_SET_CE_SCORE, 2, options_action_arg_number, }, - { CA_SET_CE_VALUE, 2, options_action_arg_number, }, - { CA_SET_PLAYER_GRAVITY, 1, options_action_arg_gravity, }, - { CA_SET_WIND_DIRECTION, 1, options_action_arg_direction, }, + { CA_SET_TIME, 3, options_action_arg_number, }, + { CA_SET_GEMS, 3, options_action_arg_number, }, + { CA_SET_SCORE, 3, options_action_arg_number, }, + { CA_SET_KEYS, 2, options_action_arg_key, }, + { CA_SET_SPEED, 1, options_action_arg_speed, }, + { CA_SET_GRAVITY, 1, options_action_arg_gravity, }, + { CA_SET_WIND, 1, options_action_arg_direction, }, + { CA_SET_CE_SCORE, 3, options_action_arg_number, }, + { CA_SET_CE_VALUE, 3, options_action_arg_number, }, { -1, FALSE, NULL } }; @@ -1998,7 +2013,7 @@ static struct -1, options_change_trigger_side, &custom_element_change.trigger_side, - "at", "side", "element side that causes change" + "at", "side", "element side triggering change" }, { ED_ELEMENT_SETTINGS_XPOS(2), ED_ELEMENT_SETTINGS_YPOS(7), @@ -2327,6 +2342,13 @@ static struct NULL, "use spring pushing bug", "use odd spring pushing behaviour" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + GADGET_ID_USE_TIME_ORB_BUG, GADGET_ID_NONE, + &level.use_time_orb_bug, + NULL, + "use time orb bug", "use odd time orb behaviour" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(0), GADGET_ID_GROW_INTO_DIGGABLE, GADGET_ID_NONE, @@ -2341,6 +2363,13 @@ static struct NULL, "double speed movement", "set initial movement speed of player" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + GADGET_ID_BLOCK_SNAP_FIELD, GADGET_ID_NONE, + &level.block_snap_field, + NULL, + "block snap field when snapping", "use snapping delay to show animation" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), GADGET_ID_BLOCK_LAST_FIELD, GADGET_ID_NONE, @@ -7338,6 +7367,7 @@ static void DrawPropertiesConfig() MapCheckbuttonGadget(properties_element == EL_SP_MURPHY ? ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD : ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INSTANT_RELOCATION); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DOUBLE_SPEED); @@ -7367,6 +7397,9 @@ static void DrawPropertiesConfig() if (properties_element == EL_SPRING) MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_SPRING_BUG); + if (properties_element == EL_TIME_ORB_FULL) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG); + #if 0 if (properties_element == EL_BALLOON) MapSelectboxGadget(ED_SELECTBOX_ID_WIND_DIRECTION); @@ -9640,7 +9673,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) else if (id == GADGET_ID_CUSTOM_MOVE_LEAVE) strcpy(infotext, "Element that will be left behind"); else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) - strcpy(infotext, "New element after change"); + strcpy(infotext, "New target element after change"); else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) strcpy(infotext, "New extended elements after change"); else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)