X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=da3101233d7f2884aed22c27b1d34983281c9887;hb=8f9768f67f24a3279d812ee1760e8dc8e723145d;hp=9cd163a506eb7891c9f726b2606432424f655804;hpb=ac0b7706bf6edba12ba74f9962ff2e617f9ad41a;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 9cd163a5..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 @@ -109,9 +120,9 @@ #define ED_SETTINGS_YOFFSET (3 * MINI_TILEY / 2) #define ED_SETTINGS_XPOS(n) (ED_SETTINGS_XSTART + \ - n * ED_SETTINGS_XOFFSET) + (n) * ED_SETTINGS_XOFFSET) #define ED_SETTINGS_YPOS(n) (ED_SETTINGS_YSTART + \ - n * ED_SETTINGS_YOFFSET) + (n) * ED_SETTINGS_YOFFSET) #define ED_SETTINGS1_YPOS MINI_TILEY #define ED_SETTINGS2_XPOS MINI_TILEX @@ -121,9 +132,9 @@ #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) + (n) * ED_COUNTER_YDISTANCE) #define ED_COUNTER2_YPOS(n) (ED_COUNTER_YSTART + \ - n * ED_COUNTER_YDISTANCE - 2) + (n) * ED_COUNTER_YDISTANCE - 2) /* values for element content drawing areas */ /* amoeba content */ @@ -133,9 +144,9 @@ /* yamyam content */ #define ED_AREA_YAMYAM_CONTENT_XPOS(n) (2 * MINI_TILEX + \ - 5 * (n % 4) * MINI_TILEX) -#define ED_AREA_YAMYAM_CONTENT_YPOS(n) (22 * MINI_TILEY + \ - 6 * (n / 4) * MINI_TILEY) + 5 * ((n) % 4) * MINI_TILEX) +#define ED_AREA_YAMYAM_CONTENT_YPOS(n) (17 * MINI_TILEY + \ + 6 * ((n) / 4) * MINI_TILEY) /* custom change target */ #define ED_AREA_ELEM_CONTENT2_YPOS (ED_SETTINGS_YPOS(1) + \ @@ -159,7 +170,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(9) + \ +#define ED_AREA_ELEM_CONTENT6_YPOS (ED_SETTINGS_YPOS(10) + \ ED_GADGET_DISTANCE - MINI_TILEY) /* group element content */ #define ED_AREA_GROUP_CONTENT_XPOS ED_SETTINGS_XPOS(0) @@ -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) @@ -439,29 +452,32 @@ /* selectbox identifiers */ #define GADGET_ID_SELECTBOX_FIRST (GADGET_ID_TEXT_AREA_FIRST + 1) -#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 0) -#define GADGET_ID_CUSTOM_CONSISTENCY (GADGET_ID_SELECTBOX_FIRST + 1) -#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 2) -#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 3) -#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 4) -#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 5) -#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 6) -#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 7) -#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 8) -#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 9) -#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 10) -#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 11) -#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 12) -#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 13) -#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 14) -#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 15) -#define GADGET_ID_CHANGE_SIDES (GADGET_ID_SELECTBOX_FIRST + 16) -#define GADGET_ID_CHANGE_POWER (GADGET_ID_SELECTBOX_FIRST + 17) -#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 18) -#define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 19) +#define GADGET_ID_TIME_OR_STEPS (GADGET_ID_SELECTBOX_FIRST + 0) +#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 1) +#define GADGET_ID_CUSTOM_CONSISTENCY (GADGET_ID_SELECTBOX_FIRST + 2) +#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 3) +#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 4) +#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 5) +#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 6) +#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 7) +#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 8) +#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 9) +#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 10) +#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 11) +#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 12) +#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 13) +#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 14) +#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 15) +#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 16) +#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_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) /* textbutton identifiers */ -#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 20) +#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 23) #define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0) #define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1) @@ -505,32 +521,37 @@ #define GADGET_ID_GRAVITY (GADGET_ID_CHECKBUTTON_FIRST + 4) #define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 5) #define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 6) -#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 7) -#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 8) -#define GADGET_ID_CUSTOM_EXPLODE_RESULT (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 29) +#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_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 + 30) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 35) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -623,28 +644,34 @@ #define ED_TEXTAREA_ID_LEVEL_LAST ED_TEXTAREA_ID_ENVELOPE /* values for selectbox gadgets */ -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 0 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 1 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 2 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 3 -#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 4 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 5 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 6 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 7 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 8 -#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 9 -#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 10 -#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 11 -#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY 12 -#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 13 -#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 14 -#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 15 -#define ED_SELECTBOX_ID_CHANGE_SIDES 16 -#define ED_SELECTBOX_ID_CHANGE_POWER 17 -#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 18 -#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 19 - -#define ED_NUM_SELECTBOX 20 +#define ED_SELECTBOX_ID_TIME_OR_STEPS 0 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 1 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 2 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 3 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 4 +#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 5 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 6 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 7 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 8 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 9 +#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 10 +#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 11 +#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 12 +#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY 13 +#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 14 +#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 15 +#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 16 +#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_REPLACE_WHEN 20 +#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 21 +#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 22 + +#define ED_NUM_SELECTBOX 23 + +#define ED_SELECTBOX_ID_LEVEL_FIRST ED_SELECTBOX_ID_TIME_OR_STEPS +#define ED_SELECTBOX_ID_LEVEL_LAST ED_SELECTBOX_ID_TIME_OR_STEPS #define ED_SELECTBOX_ID_CUSTOM1_FIRST ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE #define ED_SELECTBOX_ID_CUSTOM1_LAST ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE @@ -689,31 +716,36 @@ #define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 2 #define ED_CHECKBUTTON_ID_STICK_ELEMENT 3 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 4 -#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 5 -#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 6 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 7 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 8 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 9 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 10 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 11 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 12 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 13 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 14 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 15 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT 16 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 17 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 18 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 19 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 20 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 21 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 22 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 23 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 24 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 25 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 26 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 27 - -#define ED_NUM_CHECKBUTTONS 28 +#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_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 @@ -849,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; @@ -905,15 +940,15 @@ static struct GADGET_ID_LEVEL_GEMSLIMIT_DOWN, GADGET_ID_LEVEL_GEMSLIMIT_UP, GADGET_ID_LEVEL_GEMSLIMIT_TEXT, GADGET_ID_NONE, &level.gems_needed, - "number of emeralds to collect:", NULL, NULL + "number of gems to collect:", NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4), - 0, 999, + 0, 9999, GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP, GADGET_ID_LEVEL_TIMELIMIT_TEXT, GADGET_ID_NONE, &level.time, - "time available to solve level:", NULL, "(0 => no time limit)" + "time or step limit to solve level:", NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(5), @@ -921,7 +956,7 @@ static struct GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP, GADGET_ID_LEVEL_TIMESCORE_TEXT, GADGET_ID_NONE, &level.score[SC_TIME_BONUS], - "score for each 10 seconds left:", NULL, NULL + "score for each 10 sec/steps left:", NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(8), @@ -943,7 +978,7 @@ static struct NULL, NULL, NULL }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(6), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(3), MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS, GADGET_ID_ELEMENT_CONTENT_DOWN, GADGET_ID_ELEMENT_CONTENT_UP, GADGET_ID_ELEMENT_CONTENT_TEXT, GADGET_ID_NONE, @@ -1067,11 +1102,11 @@ static struct NULL, "+random", NULL }, { - ED_SETTINGS_XPOS(3), ED_SETTINGS_YPOS(11), + 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, GADGET_ID_NONE, - &custom_element_change.random, + &custom_element_change.random_percentage, NULL, "use random replace:", "%" }, }; @@ -1126,10 +1161,19 @@ static struct } }; +static struct ValueTextInfo options_time_or_steps[] = +{ + { 0, "seconds" }, + { 1, "steps" }, + + { -1, NULL } +}; + static struct ValueTextInfo options_access_type[] = { { EP_WALKABLE, "walkable" }, { EP_PASSABLE, "passable" }, + { -1, NULL } }; @@ -1138,6 +1182,7 @@ static struct ValueTextInfo options_access_layer[] = { EP_ACCESSIBLE_OVER, "over" }, { EP_ACCESSIBLE_INSIDE, "inside" }, { EP_ACCESSIBLE_UNDER, "under" }, + { -1, NULL } }; @@ -1145,6 +1190,7 @@ static struct ValueTextInfo options_access_protected[] = { { 0, "unprotected" }, { 1, "protected" }, + { -1, NULL } }; @@ -1165,6 +1211,7 @@ static struct ValueTextInfo options_access_direction[] = { MV_VERTICAL | MV_LEFT, "vertical + left" }, { MV_VERTICAL | MV_RIGHT, "vertical + right" }, { MV_ALL_DIRECTIONS, "all directions" }, + { -1, NULL } }; @@ -1174,6 +1221,7 @@ static struct ValueTextInfo options_walk_to_action[] = { EP_COLLECTIBLE_ONLY, "collectible" }, { EP_DROPPABLE, "collectible & droppable" }, { EP_PUSHABLE, "pushable" }, + { -1, NULL } }; @@ -1199,6 +1247,7 @@ static struct ValueTextInfo options_move_pattern[] = { MV_WHEN_DROPPED, "when dropped" }, { MV_MAZE_RUNNER, "maze runner style" }, { MV_MAZE_HUNTER, "maze hunter style" }, + { -1, NULL } }; @@ -1211,6 +1260,7 @@ static struct ValueTextInfo options_move_direction[] = { MV_START_DOWN, "down" }, { MV_START_RANDOM, "random" }, { MV_START_PREVIOUS, "previous" }, + { -1, NULL } }; @@ -1221,6 +1271,10 @@ static struct ValueTextInfo options_move_stepsize[] = { 4, "normal" }, { 8, "fast" }, { 16, "very fast" }, +#if 1 + { 32, "even faster" }, +#endif + { -1, NULL } }; @@ -1228,6 +1282,7 @@ static struct ValueTextInfo options_move_leave_type[] = { { LEAVE_TYPE_UNLIMITED, "leave behind" }, { LEAVE_TYPE_LIMITED, "change it to" }, + { -1, NULL } }; @@ -1238,6 +1293,7 @@ static struct ValueTextInfo options_smash_targets[] = { EP_CAN_SMASH_ENEMIES, "enemies" }, #endif { EP_CAN_SMASH_EVERYTHING, "everything" }, + { -1, NULL } }; @@ -1248,6 +1304,7 @@ static struct ValueTextInfo options_slippery_type[] = { SLIPPERY_ANY_RIGHT_LEFT, "right, left" }, { SLIPPERY_ONLY_LEFT, "only left" }, { SLIPPERY_ONLY_RIGHT, "only right" }, + { -1, NULL } }; @@ -1256,15 +1313,17 @@ static struct ValueTextInfo options_deadliness[] = { EP_DONT_RUN_INTO, "running into" }, { EP_DONT_COLLIDE_WITH, "colliding with" }, { EP_DONT_TOUCH, "touching" }, + { -1, NULL } }; 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" }, + { -1, NULL } }; @@ -1272,6 +1331,7 @@ static struct ValueTextInfo options_time_units[] = { { 1, "frames" }, { FRAMES_PER_SECOND, "seconds" }, + { -1, NULL } }; @@ -1292,6 +1352,7 @@ static struct ValueTextInfo options_change_direct_action[] = #endif { CE_IMPACT, "impact (on something)" }, { CE_SMASHED, "smashed (from above)" }, + { -1, NULL } }; @@ -1311,28 +1372,81 @@ static struct ValueTextInfo options_change_other_action[] = { CE_OTHER_GETS_HIT, "hit by ..." }, #endif { CE_OTHER_IS_SWITCHING, "switch of ..." }, - { CE_OTHER_IS_CHANGING, "change of" }, + { CE_OTHER_IS_CHANGING, "change by page of" }, { CE_OTHER_IS_EXPLODING, "explosion of" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_change_trigger_side[] = +{ + { CH_SIDE_LEFT, "left" }, + { CH_SIDE_RIGHT, "right" }, + { CH_SIDE_TOP, "top" }, + { CH_SIDE_BOTTOM, "bottom" }, + { CH_SIDE_LEFT_RIGHT, "left/right" }, + { CH_SIDE_TOP_BOTTOM, "top/bottom" }, + { CH_SIDE_ANY, "any" }, + { -1, NULL } }; -static struct ValueTextInfo options_change_sides[] = +static struct ValueTextInfo options_change_trigger_player[] = { - { CH_SIDE_LEFT, "left side" }, - { CH_SIDE_RIGHT, "right side" }, - { CH_SIDE_TOP, "top side" }, - { CH_SIDE_BOTTOM, "bottom side" }, - { CH_SIDE_LEFT_RIGHT, "left/right side" }, - { CH_SIDE_TOP_BOTTOM, "top/bottom side" }, - { CH_SIDE_ANY, "any side" }, + { CH_PLAYER_1, "1" }, + { CH_PLAYER_2, "2" }, + { CH_PLAYER_3, "3" }, + { CH_PLAYER_4, "4" }, + { CH_PLAYER_ANY, "any" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_change_trigger_page[] = +{ + { (1 << 0), "1" }, + { (1 << 1), "2" }, + { (1 << 2), "3" }, + { (1 << 3), "4" }, + { (1 << 4), "5" }, + { (1 << 5), "6" }, + { (1 << 6), "7" }, + { (1 << 7), "8" }, + { (1 << 8), "9" }, + { (1 << 9), "10" }, + { (1 << 10), "11" }, + { (1 << 11), "12" }, + { (1 << 12), "13" }, + { (1 << 13), "14" }, + { (1 << 14), "15" }, + { (1 << 15), "16" }, + { (1 << 16), "17" }, + { (1 << 17), "18" }, + { (1 << 18), "19" }, + { (1 << 19), "20" }, + { (1 << 20), "21" }, + { (1 << 21), "22" }, + { (1 << 22), "23" }, + { (1 << 23), "24" }, + { (1 << 24), "25" }, + { (1 << 25), "26" }, + { (1 << 26), "27" }, + { (1 << 27), "28" }, + { (1 << 28), "29" }, + { (1 << 29), "30" }, + { (1 << 30), "31" }, + { (1 << 31), "32" }, + { CH_PAGE_ANY, "any" }, + { -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 } }; @@ -1349,6 +1463,7 @@ static struct ValueTextInfo options_group_choice_mode[] = { ANIM_LINEAR, "linear" }, { ANIM_PINGPONG, "pingpong" }, { ANIM_PINGPONG2, "pingpong 2" }, + { -1, NULL } }; @@ -1363,6 +1478,17 @@ static struct char *text_left, *text_right, *infotext; } selectbox_info[ED_NUM_SELECTBOX] = { + /* ---------- level and editor settings ---------------------------------- */ + + { + -1, ED_COUNTER_YPOS(4), + GADGET_ID_TIME_OR_STEPS, GADGET_ID_LEVEL_TIMELIMIT_UP, + -1, + options_time_or_steps, + &level.use_step_counter, + NULL, "(0 => no limit)", "time or step limit" + }, + /* ---------- element settings: configure 1 (custom elements) ----------- */ { @@ -1501,22 +1627,38 @@ static struct }, { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(6), - GADGET_ID_CHANGE_SIDES, GADGET_ID_NONE, + GADGET_ID_CHANGE_SIDE, GADGET_ID_NONE, + -1, + options_change_trigger_side, + &custom_element_change.trigger_side, + "... at", "side", "element side that causes change" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(7), + GADGET_ID_CHANGE_PLAYER, GADGET_ID_NONE, + -1, + options_change_trigger_player, + &custom_element_change.trigger_player, + "player:", " ", "player that causes change" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(7), + GADGET_ID_CHANGE_PAGE, GADGET_ID_CHANGE_PLAYER, -1, - options_change_sides, - &custom_element_change.sides, - "... at", NULL, "element side that causes change" + options_change_trigger_page, + &custom_element_change.trigger_page, + "page:", NULL, "change page that causes change" }, { - ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(9), - GADGET_ID_CHANGE_POWER, GADGET_ID_NONE, + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(10), + 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" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(14), GADGET_ID_SELECT_CHANGE_PAGE, GADGET_ID_NONE, 3, options_change_page, @@ -1604,13 +1746,13 @@ static struct " ", "As Template", "Save current settings as new template" }, { - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(14), GADGET_ID_ADD_CHANGE_PAGE, GADGET_ID_NEXT_CHANGE_PAGE, -1, "New", " ", NULL, "Add new change page" }, { - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(14), GADGET_ID_DEL_CHANGE_PAGE, GADGET_ID_ADD_CHANGE_PAGE, -1, "Delete", NULL, NULL, "Delete current change page" @@ -1629,14 +1771,14 @@ static struct { { ED_BUTTON_MINUS_XPOS, ED_BUTTON_COUNT_YPOS, - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(13), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(14), ED_BUTTON_COUNT_XSIZE, ED_BUTTON_COUNT_YSIZE, GADGET_ID_PREV_CHANGE_PAGE, GADGET_ID_NONE, NULL, NULL, "select previous change page" }, { ED_BUTTON_PLUS_XPOS, ED_BUTTON_COUNT_YPOS, - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(14), ED_BUTTON_COUNT_XSIZE, ED_BUTTON_COUNT_YSIZE, GADGET_ID_NEXT_CHANGE_PAGE, GADGET_ID_SELECT_CHANGE_PAGE, NULL, "change page", "select next change page" @@ -1800,19 +1942,54 @@ static struct "slip down from certain flat walls","use EM style slipping behaviour" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), + GADGET_ID_USE_SPRING_BUG, GADGET_ID_NONE, + &level.use_spring_bug, + NULL, + "use spring pushing bug", "use odd spring pushing behaviour" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), GADGET_ID_BLOCK_LAST_FIELD, GADGET_ID_NONE, &level.block_last_field, NULL, "block last field when moving", "player blocks last field when moving" }, { - ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), GADGET_ID_SP_BLOCK_LAST_FIELD, GADGET_ID_NONE, &level.sp_block_last_field, 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, + &custom_element_properties[EP_CAN_MOVE_INTO_ACID], + NULL, + "can fall into acid (with gravity)","player can fall into acid pool" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), + GADGET_ID_CAN_MOVE_INTO_ACID, GADGET_ID_NONE, + &custom_element_properties[EP_CAN_MOVE_INTO_ACID], + NULL, + "can move into acid", "element can move into acid pool" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), + GADGET_ID_DONT_COLLIDE_WITH, GADGET_ID_NONE, + &custom_element_properties[EP_DONT_COLLIDE_WITH], + NULL, + "deadly when colliding with", "element is deadly when hitting player" + }, /* ---------- element settings: configure 1 (custom elements) ----------- */ @@ -1925,27 +2102,27 @@ static struct NULL, NULL, "element changes by other element" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(7), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(8), GADGET_ID_CHANGE_USE_EXPLOSION, GADGET_ID_NONE, &custom_element_change.explode, NULL, "explode instead of change", "element explodes instead of change" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(8), + 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(10), + 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(11), + 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" }, }; @@ -2143,7 +2320,7 @@ static void DrawDrawingWindow(); static void DrawLevelInfoWindow(); static void DrawPropertiesWindow(); static void UpdateCustomElementGraphicGadgets(); -static boolean checkPropertiesConfig(); +static boolean checkPropertiesConfig(int); static void CopyLevelToUndoBuffer(int); static void HandleDrawingAreas(struct GadgetInfo *); static void HandleCounterButtons(struct GadgetInfo *); @@ -3145,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; @@ -3360,6 +3542,8 @@ editor_elements_info[] = } }; +#if 0 + static struct { short element; @@ -3559,6 +3743,8 @@ forum_sketch_element_strings[] = { -1, NULL } }; +#endif + /* ----------------------------------------------------------------------------- @@ -3811,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)); @@ -3921,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; @@ -3936,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; @@ -3944,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; @@ -3959,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, @@ -4223,7 +4424,7 @@ static void CreateCounterButtons() GDI_NUMBER_VALUE, 0, GDI_NUMBER_MIN, counterbutton_info[i].min_value, GDI_NUMBER_MAX, counterbutton_info[i].max_value, - GDI_TEXT_SIZE, 3, + GDI_TEXT_SIZE, 3, /* minimal counter text size */ GDI_TEXT_FONT, font_type, GDI_TEXT_FONT_ACTIVE, font_type_active, GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y, @@ -4857,19 +5058,18 @@ static void MapCounterButtons(int id) int x_right = gi_up->x + gi_up->width + xoffset_right; int y_above = gi_down->y - yoffset_above; int x = gi_down->x; - int y = gi_up->y + yoffset; + int y; /* set after gadget position was modified */ #endif -#if 1 - /* special case needed for "score" counter gadget */ + /* set position for "score" counter gadget */ if (id == ED_COUNTER_ID_ELEMENT_SCORE) { ModifyGadget(gi_down, GDI_Y, SY + counterbutton_info[id].y, GDI_END); ModifyGadget(gi_text, GDI_Y, SY + counterbutton_info[id].y, GDI_END); ModifyGadget(gi_up, GDI_Y, SY + counterbutton_info[id].y, GDI_END); - y = gi_up->y + yoffset; } -#endif + + y = gi_up->y + yoffset; if (counterbutton_info[id].text_above) DrawText(x, y_above, counterbutton_info[id].text_above, FONT_TEXT_1); @@ -5071,11 +5271,12 @@ static void MapCheckbuttonGadget(int id) int yoffset = ED_BORDER_SIZE; int x_left = gi->x - xoffset_left; int x_right = gi->x + gi->width + xoffset_right; - int y = gi->y + yoffset; + int y; /* set after gadget position was modified */ + + /* set position for "stickybutton" and "can move into acid" gadgets */ + if (id == ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID) + ModifyGadget(gi, GDI_Y, SY + checkbutton_info[id].y, GDI_END); - /* special case needed for "sticky" gadget */ - ModifyGadget(gi, GDI_CHECKED, *checkbutton_info[id].value, - GDI_Y, SY + checkbutton_info[id].y, GDI_END); y = gi->y + yoffset; if (checkbutton_info[id].text_left) @@ -5084,6 +5285,8 @@ static void MapCheckbuttonGadget(int id) if (checkbutton_info[id].text_right) DrawText(x_right, y, checkbutton_info[id].text_right, FONT_TEXT_1); + ModifyGadget(gi, GDI_CHECKED, *checkbutton_info[id].value, GDI_END); + MapGadget(gi); } @@ -5126,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]); @@ -5282,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]; @@ -5324,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]; @@ -5333,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; @@ -5345,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; - - 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; + ei_to->explosion_delay = ei_from->explosion_delay; + ei_to->ignition_delay = ei_from->ignition_delay; - 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->sides = change_from->sides; - } #endif /* mark this custom element as modified */ @@ -5420,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 */ @@ -5445,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); @@ -5468,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(); @@ -5582,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)) @@ -5640,12 +5843,37 @@ static void CopyGroupElementPropertiesToEditor(int element) custom_element = element_info[element]; /* needed for description */ } +static void CopyClassicElementPropertiesToEditor(int element) +{ +#if 1 + if (ELEM_IS_PLAYER(element) || COULD_MOVE_INTO_ACID(element)) + custom_element_properties[EP_CAN_MOVE_INTO_ACID] = + getMoveIntoAcidProperty(&level, element); + + if (MAYBE_DONT_COLLIDE_WITH(element)) + custom_element_properties[EP_DONT_COLLIDE_WITH] = + getDontCollideWithProperty(&level, element); +#else + + if (COULD_MOVE_INTO_ACID(element)) + { + int bit_nr = get_special_property_bit(element, EP_CAN_MOVE_INTO_ACID); + + if (bit_nr > -1) + custom_element_properties[EP_CAN_MOVE_INTO_ACID] = + ((level.can_move_into_acid_bits & (1 << bit_nr)) != 0); + } +#endif +} + static void CopyElementPropertiesToEditor(int element) { if (IS_CUSTOM_ELEMENT(element)) CopyCustomElementPropertiesToEditor(element); else if (IS_GROUP_ELEMENT(element)) CopyGroupElementPropertiesToEditor(element); + else + CopyClassicElementPropertiesToEditor(element); } static void CopyCustomElementPropertiesToGame(int element) @@ -5719,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; @@ -5729,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; @@ -5794,12 +6022,41 @@ static void CopyGroupElementPropertiesToGame(int element) element_info[element].modified_settings = TRUE; } +static void CopyClassicElementPropertiesToGame(int element) +{ +#if 1 + if (ELEM_IS_PLAYER(element) || COULD_MOVE_INTO_ACID(element)) + setMoveIntoAcidProperty(&level, element, + custom_element_properties[EP_CAN_MOVE_INTO_ACID]); + + if (MAYBE_DONT_COLLIDE_WITH(element)) + setDontCollideWithProperty(&level, element, + custom_element_properties[EP_DONT_COLLIDE_WITH]); +#else + + if (COULD_MOVE_INTO_ACID(element)) + { + int bit_nr = get_special_property_bit(element, EP_CAN_MOVE_INTO_ACID); + + if (bit_nr > -1) + { + level.can_move_into_acid_bits &= ~(1 << bit_nr); + + if (custom_element_properties[EP_CAN_MOVE_INTO_ACID]) + level.can_move_into_acid_bits |= (1 << bit_nr); + } + } +#endif +} + static void CopyElementPropertiesToGame(int element) { if (IS_CUSTOM_ELEMENT(element)) CopyCustomElementPropertiesToGame(element); else if (IS_GROUP_ELEMENT(element)) CopyGroupElementPropertiesToGame(element); + else + CopyClassicElementPropertiesToGame(element); } void DrawLevelEd() @@ -6096,6 +6353,10 @@ static void DrawLevelInfoWindow() for (i = ED_COUNTER_ID_LEVEL_FIRST; i <= ED_COUNTER_ID_LEVEL_LAST; i++) MapCounterButtons(i); + /* draw selectbox gadgets */ + for (i = ED_SELECTBOX_ID_LEVEL_FIRST; i <= ED_SELECTBOX_ID_LEVEL_LAST; i++) + MapSelectboxGadget(i); + /* draw checkbutton gadgets */ for (i=ED_CHECKBUTTON_ID_LEVEL_FIRST; i <= ED_CHECKBUTTON_ID_LEVEL_LAST; i++) MapCheckbuttonGadget(i); @@ -6134,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; @@ -6564,19 +6825,23 @@ static struct { 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, &level.score[SC_BUG], TEXT_SMASHING }, { 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_BUG_DOWN, &level.score[SC_BUG], TEXT_SMASHING }, + { EL_BD_BUTTERFLY, &level.score[SC_BUG], TEXT_SMASHING }, { EL_BD_BUTTERFLY_RIGHT,&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, &level.score[SC_SPACESHIP], 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_SPACESHIP_DOWN, &level.score[SC_SPACESHIP], TEXT_SMASHING }, + { EL_BD_FIREFLY, &level.score[SC_SPACESHIP], TEXT_SMASHING }, { EL_BD_FIREFLY_RIGHT,&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 }, @@ -6585,6 +6850,7 @@ static struct { 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, &level.score[SC_PACMAN], TEXT_SMASHING }, { EL_PACMAN_RIGHT, &level.score[SC_PACMAN], TEXT_SMASHING }, { EL_PACMAN_UP, &level.score[SC_PACMAN], TEXT_SMASHING }, { EL_PACMAN_LEFT, &level.score[SC_PACMAN], TEXT_SMASHING }, @@ -6621,20 +6887,22 @@ static struct { -1, NULL, NULL } }; -static boolean checkPropertiesConfig() +static boolean checkPropertiesConfig(int element) { int i; - if (IS_GEM(properties_element) || - IS_CUSTOM_ELEMENT(properties_element) || - IS_GROUP_ELEMENT(properties_element) || - IS_ENVELOPE(properties_element) || - ELEM_IS_PLAYER(properties_element) || - HAS_CONTENT(properties_element)) + if (IS_GEM(element) || + IS_CUSTOM_ELEMENT(element) || + IS_GROUP_ELEMENT(element) || + IS_ENVELOPE(element) || + ELEM_IS_PLAYER(element) || + HAS_CONTENT(element) || + COULD_MOVE_INTO_ACID(element) || + MAYBE_DONT_COLLIDE_WITH(element)) return TRUE; else for (i = 0; elements_with_counter[i].element != -1; i++) - if (elements_with_counter[i].element == properties_element) + if (elements_with_counter[i].element == element) return TRUE; return FALSE; @@ -6644,7 +6912,7 @@ static void DrawPropertiesConfig() { int i; - if (!checkPropertiesConfig()) + if (!checkPropertiesConfig(properties_element)) { PrintInfoText("No configuration options available.", FONT_TEXT_1, 0); @@ -6658,10 +6926,10 @@ static void DrawPropertiesConfig() { int counter_id = ED_COUNTER_ID_ELEMENT_SCORE; - if (HAS_CONTENT(properties_element)) /* needs stickybutton */ - counterbutton_info[counter_id].y = ED_SETTINGS_YPOS(1); - else - counterbutton_info[counter_id].y = ED_SETTINGS_YPOS(0); + counterbutton_info[counter_id].y = + ED_SETTINGS_YPOS((HAS_CONTENT(properties_element) ? 1 : 0) + + (MAYBE_DONT_COLLIDE_WITH(properties_element) ? 1 : 0)+ + (COULD_MOVE_INTO_ACID(properties_element) ? 1 : 0)); counterbutton_info[counter_id].value = elements_with_counter[i].value; counterbutton_info[counter_id].text_right= elements_with_counter[i].text; @@ -6683,13 +6951,35 @@ static void DrawPropertiesConfig() DrawElementContentAreas(); } - if (IS_GEM(properties_element)) - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS); - if (ELEM_IS_PLAYER(properties_element)) + { + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID); 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)) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS); + + if (COULD_MOVE_INTO_ACID(properties_element) && + (!IS_CUSTOM_ELEMENT(properties_element) || + edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_2)) + { + /* set position for special checkbutton for "can move into acid" */ + checkbutton_info[ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID].y = + ED_SETTINGS_YPOS(IS_CUSTOM_ELEMENT(properties_element) ? 6 : + HAS_CONTENT(properties_element) ? 1 : 0); + + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID); + } + + if (MAYBE_DONT_COLLIDE_WITH(properties_element)) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH); + + if (properties_element == EL_SPRING) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_SPRING_BUG); if (IS_ENVELOPE(properties_element)) { @@ -7187,6 +7477,8 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, { int element = brush_buffer[x][y]; int element_mapped = element; + +#if 0 char *element_string = "?"; int k; @@ -7212,6 +7504,16 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, } printf("`%s", element_string); + +#else + + if (IS_CUSTOM_ELEMENT(element)) + element_mapped = EL_CUSTOM_START; + else if (element > EL_ENVELOPE_4) + element_mapped = EL_CHAR_QUESTION; /* change to EL_UNKNOWN ... */ + + printf("`%03d", element_mapped); +#endif } printf("\n"); @@ -7780,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); } @@ -7913,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) @@ -8137,11 +8439,14 @@ static void HandleCheckbuttons(struct GadgetInfo *gi) *checkbutton_info[type_id].value ^= TRUE; - if (((type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST && - type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST) || - (type_id >= ED_CHECKBUTTON_ID_CHANGE_FIRST && - type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST)) && - type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE) + if (type_id == ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID || + type_id == ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID || + type_id == ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH || + (((type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST && + type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST) || + (type_id >= ED_CHECKBUTTON_ID_CHANGE_FIRST && + type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST)) && + type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE)) { CopyElementPropertiesToGame(properties_element); } @@ -8376,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) { @@ -8846,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)