X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=da3101233d7f2884aed22c27b1d34983281c9887;hb=8f9768f67f24a3279d812ee1760e8dc8e723145d;hp=af251d33341060df607549939c1b98f0e5dd9813;hpb=5216f629803d5255919cadc2419fb1e798812ae2;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index af251d33..da310123 100644 --- a/src/editor.c +++ b/src/editor.c @@ -47,6 +47,8 @@ #define ED_CTRL1_BUTTONS_GFX_YPOS 236 #define ED_CTRL2_BUTTONS_GFX_YPOS 236 #define ED_CTRL3_BUTTONS_GFX_YPOS 324 +#define ED_CTRL4_BUTTONS_GFX_XPOS 44 +#define ED_CTRL4_BUTTONS_GFX_YPOS 214 #define ED_CTRL1_BUTTONS_ALT_GFX_YPOS 142 #define ED_CTRL3_BUTTONS_ALT_GFX_YPOS 302 @@ -62,6 +64,10 @@ #define ED_CTRL3_BUTTON_YSIZE 22 #define ED_CTRL3_BUTTONS_XPOS 6 #define ED_CTRL3_BUTTONS_YPOS 6 +#define ED_CTRL4_BUTTON_XSIZE 22 +#define ED_CTRL4_BUTTON_YSIZE 22 +#define ED_CTRL4_BUTTONS_XPOS 6 +#define ED_CTRL4_BUTTONS_YPOS 6 #define ED_CTRL1_BUTTONS_HORIZ 4 #define ED_CTRL1_BUTTONS_VERT 4 @@ -69,14 +75,19 @@ #define ED_CTRL2_BUTTONS_VERT 2 #define ED_CTRL3_BUTTONS_HORIZ 3 #define ED_CTRL3_BUTTONS_VERT 1 +#define ED_CTRL4_BUTTONS_HORIZ 2 +#define ED_CTRL4_BUTTONS_VERT 1 #define ED_NUM_CTRL1_BUTTONS (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT) #define ED_NUM_CTRL2_BUTTONS (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT) #define ED_NUM_CTRL3_BUTTONS (ED_CTRL3_BUTTONS_HORIZ * ED_CTRL3_BUTTONS_VERT) -#define ED_NUM_CTRL1_2_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) +#define ED_NUM_CTRL4_BUTTONS (ED_CTRL4_BUTTONS_HORIZ * ED_CTRL4_BUTTONS_VERT) +#define ED_NUM_CTRL1_2_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) +#define ED_NUM_CTRL1_3_BUTTONS (ED_NUM_CTRL1_2_BUTTONS + ED_NUM_CTRL3_BUTTONS) #define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + \ ED_NUM_CTRL2_BUTTONS + \ - ED_NUM_CTRL3_BUTTONS) + ED_NUM_CTRL3_BUTTONS + \ + ED_NUM_CTRL4_BUTTONS) /* values for the element list */ #define ED_ELEMENTLIST_XPOS 5 @@ -327,9 +338,11 @@ #define GADGET_ID_CUSTOM_COPY_FROM (GADGET_ID_TOOLBOX_FIRST + 22) #define GADGET_ID_CUSTOM_COPY_TO (GADGET_ID_TOOLBOX_FIRST + 23) #define GADGET_ID_CUSTOM_EXCHANGE (GADGET_ID_TOOLBOX_FIRST + 24) +#define GADGET_ID_CUSTOM_COPY (GADGET_ID_TOOLBOX_FIRST + 25) +#define GADGET_ID_CUSTOM_PASTE (GADGET_ID_TOOLBOX_FIRST + 26) /* counter button identifiers */ -#define GADGET_ID_COUNTER_FIRST (GADGET_ID_TOOLBOX_FIRST + 25) +#define GADGET_ID_COUNTER_FIRST (GADGET_ID_TOOLBOX_FIRST + 27) #define GADGET_ID_SELECT_LEVEL_DOWN (GADGET_ID_COUNTER_FIRST + 0) #define GADGET_ID_SELECT_LEVEL_TEXT (GADGET_ID_COUNTER_FIRST + 1) @@ -459,7 +472,7 @@ #define GADGET_ID_CHANGE_SIDE (GADGET_ID_SELECTBOX_FIRST + 17) #define GADGET_ID_CHANGE_PLAYER (GADGET_ID_SELECTBOX_FIRST + 18) #define GADGET_ID_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 19) -#define GADGET_ID_CHANGE_POWER (GADGET_ID_SELECTBOX_FIRST + 20) +#define GADGET_ID_CHANGE_REPLACE_WHEN (GADGET_ID_SELECTBOX_FIRST + 20) #define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 21) #define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 22) @@ -511,33 +524,34 @@ #define GADGET_ID_USE_SPRING_BUG (GADGET_ID_CHECKBUTTON_FIRST + 7) #define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 8) #define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_CUSTOM_EXPLODE_RESULT (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 10) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_CUSTOM_EXPLODE_RESULT (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 34) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 35) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -650,7 +664,7 @@ #define ED_SELECTBOX_ID_CHANGE_SIDE 17 #define ED_SELECTBOX_ID_CHANGE_PLAYER 18 #define ED_SELECTBOX_ID_CHANGE_PAGE 19 -#define ED_SELECTBOX_ID_CHANGE_POWER 20 +#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN 20 #define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 21 #define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 22 @@ -705,32 +719,33 @@ #define ED_CHECKBUTTON_ID_USE_SPRING_BUG 5 #define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 6 #define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 7 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 8 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 9 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 10 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 11 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 12 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 13 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 14 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 15 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 16 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 17 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 18 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 19 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT 20 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 21 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 22 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 23 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 24 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 25 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 26 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 27 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 28 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 29 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 30 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 31 - -#define ED_NUM_CHECKBUTTONS 32 +#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 8 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 9 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 10 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 11 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 12 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 13 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 14 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 15 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 16 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 17 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 18 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 19 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 20 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT 21 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 22 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 23 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 24 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 25 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 26 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 27 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 28 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 29 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 30 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 31 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 32 + +#define ED_NUM_CHECKBUTTONS 33 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -866,6 +881,9 @@ static struct { '\0', "copy settings from other element" }, { '\0', "copy settings to other element" }, { '\0', "exchange settings with other element" }, + + { '\0', "copy settings from this element" }, + { '\0', "paste settings to this element" }, }; static int random_placement_value = 10; @@ -1088,7 +1106,7 @@ static struct 0, 100, GADGET_ID_CHANGE_CONT_RND_DOWN, GADGET_ID_CHANGE_CONT_RND_UP, GADGET_ID_CHANGE_CONT_RND_TEXT, GADGET_ID_NONE, - &custom_element_change.random, + &custom_element_change.random_percentage, NULL, "use random replace:", "%" }, }; @@ -1253,6 +1271,9 @@ static struct ValueTextInfo options_move_stepsize[] = { 4, "normal" }, { 8, "fast" }, { 16, "very fast" }, +#if 1 + { 32, "even faster" }, +#endif { -1, NULL } }; @@ -1299,7 +1320,7 @@ static struct ValueTextInfo options_deadliness[] = static struct ValueTextInfo options_consistency[] = { { EP_CAN_EXPLODE_3X3, "can explode 3x3" }, - { EP_CAN_EXPLODE_DYNA, "can explode 3+3" }, + { EP_CAN_EXPLODE_CROSS, "can explode 3+3" }, { EP_CAN_EXPLODE_1X1, "can explode 1x1" }, { EP_INDESTRUCTIBLE, "indestructible" }, @@ -1420,11 +1441,11 @@ static struct ValueTextInfo options_change_trigger_page[] = { -1, NULL } }; -static struct ValueTextInfo options_change_power[] = +static struct ValueTextInfo options_change_replace_when[] = { - { CP_NON_DESTRUCTIVE, "empty" }, - { CP_HALF_DESTRUCTIVE, "diggable" }, - { CP_FULL_DESTRUCTIVE, "destructible" }, + { CP_WHEN_EMPTY, "empty" }, + { CP_WHEN_DIGGABLE, "diggable" }, + { CP_WHEN_DESTRUCTIBLE, "destructible" }, { -1, NULL } }; @@ -1630,10 +1651,10 @@ static struct }, { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(10), - GADGET_ID_CHANGE_POWER, GADGET_ID_NONE, + GADGET_ID_CHANGE_REPLACE_WHEN, GADGET_ID_NONE, -1, - options_change_power, - &custom_element_change.power, + options_change_replace_when, + &custom_element_change.replace_when, "replace when", NULL, "which elements can be replaced" }, { @@ -1941,6 +1962,13 @@ static struct NULL, "block last field when moving", "player blocks last field when moving" }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), + GADGET_ID_INSTANT_RELOCATION, GADGET_ID_NONE, + &level.instant_relocation, + NULL, + "no scrolling when relocating", "player gets relocated without delay" + }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), GADGET_ID_CAN_FALL_INTO_ACID, GADGET_ID_NONE, @@ -2082,19 +2110,19 @@ static struct { ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(9), GADGET_ID_CHANGE_USE_CONTENT, GADGET_ID_NONE, - &custom_element_change.use_content, + &custom_element_change.use_target_content, NULL, "use extended change target:","element changes to more elements" }, { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(11), GADGET_ID_CHANGE_ONLY_COMPLETE, GADGET_ID_NONE, - &custom_element_change.only_complete, + &custom_element_change.only_if_complete, NULL, "replace all or nothing", "only replace when all can be changed" }, { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(12), GADGET_ID_CHANGE_USE_RANDOM, GADGET_ID_NONE, - &custom_element_change.use_random_change, + &custom_element_change.use_random_replace, NULL, NULL, "use percentage for random replace" }, }; @@ -3294,7 +3322,12 @@ static int editor_el_custom_more[] = EL_CUSTOM_START + 252, EL_CUSTOM_START + 253, EL_CUSTOM_START + 254, - EL_CUSTOM_START + 255 + EL_CUSTOM_START + 255, + + EL_TRIGGER_ELEMENT, + EL_TRIGGER_PLAYER, + EL_EMPTY, + EL_EMPTY }; static int *editor_hl_custom_more_ptr = editor_hl_custom_more; static int *editor_el_custom_more_ptr = editor_el_custom_more; @@ -3964,7 +3997,7 @@ static void DrawDrawingArea(int id) 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])); + el2edimg(custom_element_change.target_content[x][y])); else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER) DrawMiniGraphicExt(drawto, gi->x, gi->y, el2edimg(custom_element_change.trigger_element)); @@ -4074,7 +4107,7 @@ static void CreateControlButtons() gd_xoffset = ED_CTRL1_BUTTONS_XPOS + x * ED_CTRL1_BUTTON_XSIZE; gd_yoffset = ED_CTRL1_BUTTONS_YPOS + y * ED_CTRL1_BUTTON_YSIZE; - width = ED_CTRL1_BUTTON_XSIZE; + width = ED_CTRL1_BUTTON_XSIZE; height = ED_CTRL1_BUTTON_YSIZE; gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset; @@ -4089,7 +4122,7 @@ static void CreateControlButtons() gd_xoffset = ED_CTRL2_BUTTONS_XPOS + x * ED_CTRL2_BUTTON_XSIZE; gd_yoffset = ED_CTRL2_BUTTONS_YPOS + y * ED_CTRL2_BUTTON_YSIZE; - width = ED_CTRL2_BUTTON_XSIZE; + width = ED_CTRL2_BUTTON_XSIZE; height = ED_CTRL2_BUTTON_YSIZE; gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset; @@ -4097,14 +4130,14 @@ static void CreateControlButtons() gd_y1 = DOOR_GFX_PAGEY1 + ED_CTRL2_BUTTONS_GFX_YPOS + gd_yoffset; gd_y2 = 0; /* no alternative graphic for these buttons */ } - else + else if (id < ED_NUM_CTRL1_3_BUTTONS) { int x = (i - ED_NUM_CTRL1_2_BUTTONS) % ED_CTRL3_BUTTONS_HORIZ + 1; int y = (i - ED_NUM_CTRL1_2_BUTTONS) / ED_CTRL3_BUTTONS_HORIZ; gd_xoffset = ED_CTRL3_BUTTONS_XPOS + x * ED_CTRL3_BUTTON_XSIZE; gd_yoffset = ED_CTRL3_BUTTONS_YPOS + y * ED_CTRL3_BUTTON_YSIZE; - width = ED_CTRL3_BUTTON_XSIZE; + width = ED_CTRL3_BUTTON_XSIZE; height = ED_CTRL3_BUTTON_YSIZE; gd_x1 = DOOR_GFX_PAGEX6 + gd_xoffset; @@ -4112,6 +4145,21 @@ static void CreateControlButtons() gd_y1 = DOOR_GFX_PAGEY1 + ED_CTRL3_BUTTONS_GFX_YPOS + gd_yoffset; gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL3_BUTTONS_ALT_GFX_YPOS + gd_yoffset; } + else + { + int x = (i - ED_NUM_CTRL1_3_BUTTONS) % ED_CTRL4_BUTTONS_HORIZ; + int y = (i - ED_NUM_CTRL1_3_BUTTONS) / ED_CTRL4_BUTTONS_HORIZ + 3; + + gd_xoffset = ED_CTRL4_BUTTONS_XPOS + x * ED_CTRL4_BUTTON_XSIZE; + gd_yoffset = ED_CTRL4_BUTTONS_YPOS + y * ED_CTRL4_BUTTON_YSIZE; + width = ED_CTRL4_BUTTON_XSIZE; + height = ED_CTRL4_BUTTON_YSIZE; + + gd_x1 = DOOR_GFX_PAGEX6 + ED_CTRL4_BUTTONS_GFX_XPOS + gd_xoffset; + gd_x2 = DOOR_GFX_PAGEX5 + ED_CTRL4_BUTTONS_GFX_XPOS + gd_xoffset; + gd_y1 = DOOR_GFX_PAGEY1 + ED_CTRL4_BUTTONS_GFX_YPOS + gd_yoffset; + gd_y2 = 0; /* no alternative graphic for these buttons */ + } gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, @@ -5281,7 +5329,9 @@ static void MapOrUnmapLevelEditorToolboxCustomGadgets(boolean map) { if (i == GADGET_ID_CUSTOM_COPY_FROM || i == GADGET_ID_CUSTOM_COPY_TO || - i == GADGET_ID_CUSTOM_EXCHANGE) + i == GADGET_ID_CUSTOM_EXCHANGE || + i == GADGET_ID_CUSTOM_COPY || + i == GADGET_ID_CUSTOM_PASTE) { if (map) MapGadget(level_editor_gadget[i]); @@ -5437,7 +5487,7 @@ static int setSelectboxValue(int selectbox_id, int new_value) static void copy_custom_element_settings(int element_from, int element_to) { -#if 1 +#if 0 struct ElementInfo ei_to_old = element_info[element_to]; struct ElementInfo *ei_from = &element_info[element_from]; struct ElementInfo *ei_to = &element_info[element_to]; @@ -5479,7 +5529,7 @@ static void copy_custom_element_settings(int element_from, int element_to) for (i = 0; i < MAX_ELEMENT_NAME_LEN + 1; i++) ei_to->description[i] = ei_from->description[i]; - /* ---------- copy element properties ---------- */ + /* ---------- copy element base properties ---------- */ Properties[element_to][EP_BITFIELD_BASE] = Properties[element_from][EP_BITFIELD_BASE]; @@ -5488,6 +5538,8 @@ static void copy_custom_element_settings(int element_from, int element_to) ei_to->use_gfx_element = ei_from->use_gfx_element; ei_to->gfx_element = ei_from->gfx_element; + ei_to->access_direction = ei_from->access_direction; + ei_to->collect_score = ei_from->collect_score; ei_to->collect_count = ei_from->collect_count; @@ -5500,49 +5552,33 @@ static void copy_custom_element_settings(int element_from, int element_to) ei_to->move_direction_initial = ei_from->move_direction_initial; ei_to->move_stepsize = ei_from->move_stepsize; + ei_to->move_enter_element = ei_from->move_enter_element; + ei_to->move_leave_element = ei_from->move_leave_element; + ei_to->move_leave_type = ei_from->move_leave_type; + ei_to->slippery_type = ei_from->slippery_type; for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) ei_to->content[x][y] = ei_from->content[x][y]; - ei_to->num_change_pages = ei_from->num_change_pages; - setElementChangePages(ei_to, ei_to->num_change_pages); - - for (i=0; i < ei_to->num_change_pages; i++) - { - struct ElementChangeInfo *change_to = &ei_to->change_page[i]; - struct ElementChangeInfo *change_from = &ei_from->change_page[i]; - - /* always start with reliable default values */ - setElementChangeInfoToDefaults(change_to); - - change_to->events = change_from->events; + ei_to->explosion_delay = ei_from->explosion_delay; + ei_to->ignition_delay = ei_from->ignition_delay; - change_to->target_element = change_from->target_element; - - change_to->delay_fixed = change_from->delay_fixed; - change_to->delay_random = change_from->delay_random; - change_to->delay_frames = change_from->delay_frames; - - change_to->trigger_element = change_from->trigger_element; + /* ---------- reinitialize and copy change pages ---------- */ - change_to->explode = change_from->explode; - change_to->use_content = change_from->use_content; - change_to->only_complete = change_from->only_complete; - change_to->use_random_change = change_from->use_random_change; + ei_to->num_change_pages = ei_from->num_change_pages; + ei_to->current_change_page = ei_from->current_change_page; - change_to->random = change_from->random; - change_to->power = change_from->power; + setElementChangePages(ei_to, ei_to->num_change_pages); - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - change_to->content[x][y] = change_from->content[x][y]; + for (i=0; i < ei_to->num_change_pages; i++) + ei_to->change_page[i] = ei_from->change_page[i]; - change_to->can_change = change_from->can_change; + /* ---------- copy group element info ---------- */ + if (ei_from->group != NULL && ei_to->group != NULL) /* group or internal */ + *ei_to->group = *ei_from->group; - change_to->trigger_side = change_from->trigger_side; - } #endif /* mark this custom element as modified */ @@ -5575,8 +5611,8 @@ static void replace_custom_element_in_settings(int element_from, for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - if (change->content[x][y] == element_from) - change->content[x][y] = element_to; + if (change->target_content[x][y] == element_from) + change->target_content[x][y] = element_to; } if (ei->group != NULL) /* group or internal */ @@ -5600,7 +5636,19 @@ static void replace_custom_element_in_playfield(int element_from, static boolean CopyCustomElement(int element_old, int element_new, int copy_mode) { - if (IS_CUSTOM_ELEMENT(element_old) && !IS_CUSTOM_ELEMENT(element_new)) + if (copy_mode == GADGET_ID_CUSTOM_COPY) + { + element_new = (IS_CUSTOM_ELEMENT(element_old) ? + EL_INTERNAL_CLIPBOARD_CUSTOM : EL_INTERNAL_CLIPBOARD_GROUP); + copy_mode = GADGET_ID_CUSTOM_COPY_TO; + } + else if (copy_mode == GADGET_ID_CUSTOM_PASTE) + { + element_old = (IS_CUSTOM_ELEMENT(element_new) ? + EL_INTERNAL_CLIPBOARD_CUSTOM : EL_INTERNAL_CLIPBOARD_GROUP); + copy_mode = GADGET_ID_CUSTOM_COPY_TO; + } + else if (IS_CUSTOM_ELEMENT(element_old) && !IS_CUSTOM_ELEMENT(element_new)) { Request("Please choose custom element !", REQ_CONFIRM); @@ -5623,17 +5671,17 @@ static boolean CopyCustomElement(int element_old, int element_new, } else if (copy_mode == GADGET_ID_CUSTOM_EXCHANGE) { - copy_custom_element_settings(element_old, EL_INTERNAL_EDITOR); + copy_custom_element_settings(element_old, EL_INTERNAL_DUMMY); copy_custom_element_settings(element_new, element_old); - copy_custom_element_settings(EL_INTERNAL_EDITOR, element_new); + copy_custom_element_settings(EL_INTERNAL_DUMMY, element_new); - replace_custom_element_in_settings(element_old, EL_INTERNAL_EDITOR); + replace_custom_element_in_settings(element_old, EL_INTERNAL_DUMMY); replace_custom_element_in_settings(element_new, element_old); - replace_custom_element_in_settings(EL_INTERNAL_EDITOR, element_new); + replace_custom_element_in_settings(EL_INTERNAL_DUMMY, element_new); - replace_custom_element_in_playfield(element_old, EL_INTERNAL_EDITOR); + replace_custom_element_in_playfield(element_old, EL_INTERNAL_DUMMY); replace_custom_element_in_playfield(element_new, element_old); - replace_custom_element_in_playfield(EL_INTERNAL_EDITOR, element_new); + replace_custom_element_in_playfield(EL_INTERNAL_DUMMY, element_new); } UpdateCustomElementGraphicGadgets(); @@ -5737,13 +5785,13 @@ static void CopyCustomElementPropertiesToEditor(int element) (IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE : CAN_EXPLODE_1X1(element) ? EP_CAN_EXPLODE_1X1 : CAN_EXPLODE_3X3(element) ? EP_CAN_EXPLODE_3X3 : - CAN_EXPLODE_DYNA(element) ? EP_CAN_EXPLODE_DYNA : + CAN_EXPLODE_CROSS(element) ? EP_CAN_EXPLODE_CROSS : custom_element.consistency); custom_element_properties[EP_EXPLODE_RESULT] = (IS_INDESTRUCTIBLE(element) || CAN_EXPLODE_1X1(element) || CAN_EXPLODE_3X3(element) || - CAN_EXPLODE_DYNA(element)); + CAN_EXPLODE_CROSS(element)); /* special case: sub-settings dependent from main setting */ if (CAN_EXPLODE_BY_FIRE(element)) @@ -5899,7 +5947,7 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_properties[EP_INDESTRUCTIBLE] = FALSE; custom_element_properties[EP_CAN_EXPLODE_1X1] = FALSE; custom_element_properties[EP_CAN_EXPLODE_3X3] = FALSE; - custom_element_properties[EP_CAN_EXPLODE_DYNA] = FALSE; + custom_element_properties[EP_CAN_EXPLODE_CROSS] = 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; @@ -5909,7 +5957,7 @@ static void CopyCustomElementPropertiesToGame(int element) /* special case: sub-settings dependent from main setting */ if (custom_element_properties[EP_CAN_EXPLODE_1X1] || custom_element_properties[EP_CAN_EXPLODE_3X3] || - custom_element_properties[EP_CAN_EXPLODE_DYNA]) + custom_element_properties[EP_CAN_EXPLODE_CROSS]) { custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = custom_element.can_explode_by_fire; @@ -6347,7 +6395,7 @@ static void DrawCustomChangeContentArea() int id = ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT; struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; int x1 = right_gadget_border[GADGET_ID_CHANGE_USE_CONTENT]; - int x2 = right_gadget_border[GADGET_ID_CHANGE_POWER]; + int x2 = right_gadget_border[GADGET_ID_CHANGE_REPLACE_WHEN]; int x3 = right_gadget_border[GADGET_ID_CHANGE_ONLY_COMPLETE]; int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; @@ -6909,6 +6957,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_INSTANT_RELOCATION); } if (IS_GEM(properties_element)) @@ -8033,7 +8082,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) { - custom_element_change.content[sx][sy] = new_element; + custom_element_change.target_content[sx][sy] = new_element; CopyCustomElementPropertiesToGame(properties_element); } @@ -8166,7 +8215,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) PickDrawingElement(button, custom_element_change.target_element); else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - PickDrawingElement(button, custom_element_change.content[sx][sy]); + PickDrawingElement(button, custom_element_change.target_content[sx][sy]); else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) PickDrawingElement(button, custom_element_change.trigger_element); else if (id == GADGET_ID_GROUP_CONTENT) @@ -8632,6 +8681,14 @@ static void HandleControlButtons(struct GadgetInfo *gi) last_drawing_function = drawing_function; break; + case GADGET_ID_CUSTOM_COPY: + CopyCustomElement(properties_element, -1, id); + break; + + case GADGET_ID_CUSTOM_PASTE: + CopyCustomElement(-1, properties_element, id); + break; + case GADGET_ID_UNDO: if (undo_buffer_steps == 0) { @@ -9102,7 +9159,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) element = custom_element_change.target_element; else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - element = custom_element_change.content[sx][sy]; + element = custom_element_change.target_content[sx][sy]; else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) element = custom_element_change.trigger_element; else if (id == GADGET_ID_GROUP_CONTENT)