X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=f832502e78894d479af5dbd4860573f51a4b6e06;hb=c46bcfd8dd92fbf3ce134eed1e64078147d33b50;hp=c2d1ba50a78b5852c2f29e2809e8c82a016876a3;hpb=1e5cae5e3ab889c3bcba80a065c6d7ba1e6d28a2;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index c2d1ba50..f832502e 100644 --- a/src/editor.c +++ b/src/editor.c @@ -477,34 +477,35 @@ #define GADGET_ID_TIME_OR_STEPS (GADGET_ID_SELECTBOX_FIRST + 0) #define GADGET_ID_GAME_ENGINE_TYPE (GADGET_ID_SELECTBOX_FIRST + 1) #define GADGET_ID_WIND_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 2) -#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 3) -#define GADGET_ID_CUSTOM_EXPLOSION_TYPE (GADGET_ID_SELECTBOX_FIRST + 4) -#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 5) -#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 6) -#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 7) -#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 8) -#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 9) -#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 10) -#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 11) -#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 12) -#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 13) -#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 14) -#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 15) -#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 16) -#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 17) -#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 18) -#define GADGET_ID_CHANGE_SIDE (GADGET_ID_SELECTBOX_FIRST + 19) -#define GADGET_ID_CHANGE_PLAYER (GADGET_ID_SELECTBOX_FIRST + 20) -#define GADGET_ID_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 21) -#define GADGET_ID_CHANGE_REPLACE_WHEN (GADGET_ID_SELECTBOX_FIRST + 22) -#define GADGET_ID_ACTION_TYPE (GADGET_ID_SELECTBOX_FIRST + 23) -#define GADGET_ID_ACTION_MODE (GADGET_ID_SELECTBOX_FIRST + 24) -#define GADGET_ID_ACTION_ARG (GADGET_ID_SELECTBOX_FIRST + 25) -#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 26) -#define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 27) +#define GADGET_ID_PLAYER_SPEED (GADGET_ID_SELECTBOX_FIRST + 3) +#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 4) +#define GADGET_ID_CUSTOM_EXPLOSION_TYPE (GADGET_ID_SELECTBOX_FIRST + 5) +#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 6) +#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 7) +#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 8) +#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 9) +#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 10) +#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 11) +#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 12) +#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 13) +#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 14) +#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 15) +#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 16) +#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 17) +#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 18) +#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 19) +#define GADGET_ID_CHANGE_SIDE (GADGET_ID_SELECTBOX_FIRST + 20) +#define GADGET_ID_CHANGE_PLAYER (GADGET_ID_SELECTBOX_FIRST + 21) +#define GADGET_ID_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 22) +#define GADGET_ID_CHANGE_REPLACE_WHEN (GADGET_ID_SELECTBOX_FIRST + 23) +#define GADGET_ID_ACTION_TYPE (GADGET_ID_SELECTBOX_FIRST + 24) +#define GADGET_ID_ACTION_MODE (GADGET_ID_SELECTBOX_FIRST + 25) +#define GADGET_ID_ACTION_ARG (GADGET_ID_SELECTBOX_FIRST + 26) +#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 27) +#define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 28) /* textbutton identifiers */ -#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 28) +#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 29) #define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0) #define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1) @@ -554,46 +555,45 @@ #define GADGET_ID_RANDOM_BALL_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 8) #define GADGET_ID_INITIAL_BALL_STATE (GADGET_ID_CHECKBUTTON_FIRST + 9) #define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_DOUBLE_SPEED (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 39) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 40) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 41) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 42) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 43) -#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 44) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 45) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 46) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 47) +#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 42) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 43) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 44) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 45) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 46) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 48) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 47) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -698,33 +698,34 @@ #define ED_SELECTBOX_ID_TIME_OR_STEPS 0 #define ED_SELECTBOX_ID_GAME_ENGINE_TYPE 1 #define ED_SELECTBOX_ID_WIND_DIRECTION 2 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 3 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 4 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 5 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 6 -#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 7 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 8 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 9 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 10 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 11 -#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 12 -#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 13 -#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 14 -#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE 15 -#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 16 -#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 17 -#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 18 -#define ED_SELECTBOX_ID_CHANGE_SIDE 19 -#define ED_SELECTBOX_ID_CHANGE_PLAYER 20 -#define ED_SELECTBOX_ID_CHANGE_PAGE 21 -#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN 22 -#define ED_SELECTBOX_ID_ACTION_TYPE 23 -#define ED_SELECTBOX_ID_ACTION_MODE 24 -#define ED_SELECTBOX_ID_ACTION_ARG 25 -#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 26 -#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 27 - -#define ED_NUM_SELECTBOX 28 +#define ED_SELECTBOX_ID_PLAYER_SPEED 3 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 4 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 5 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 6 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 7 +#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 8 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 9 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 10 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 11 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 12 +#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 13 +#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 14 +#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 15 +#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE 16 +#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 17 +#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 18 +#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 19 +#define ED_SELECTBOX_ID_CHANGE_SIDE 20 +#define ED_SELECTBOX_ID_CHANGE_PLAYER 21 +#define ED_SELECTBOX_ID_CHANGE_PAGE 22 +#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN 23 +#define ED_SELECTBOX_ID_ACTION_TYPE 24 +#define ED_SELECTBOX_ID_ACTION_MODE 25 +#define ED_SELECTBOX_ID_ACTION_ARG 26 +#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 27 +#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 28 + +#define ED_NUM_SELECTBOX 29 #define ED_SELECTBOX_ID_LEVEL_FIRST ED_SELECTBOX_ID_TIME_OR_STEPS #define ED_SELECTBOX_ID_LEVEL_LAST ED_SELECTBOX_ID_WIND_DIRECTION @@ -778,45 +779,44 @@ #define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT 6 #define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE 7 #define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 8 -#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 9 -#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 10 -#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 11 -#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 12 -#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 13 -#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 14 -#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 15 -#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 16 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 17 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 18 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 19 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 20 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 21 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 22 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 23 -#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 24 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 25 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 26 -#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 27 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 28 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 29 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 30 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 31 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 32 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 33 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 34 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 35 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 36 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 37 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 38 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 39 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 40 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 41 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 42 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 43 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 44 -#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 45 - -#define ED_NUM_CHECKBUTTONS 46 +#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 9 +#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 10 +#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 11 +#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 12 +#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 13 +#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 14 +#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 15 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 16 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 17 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 18 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 19 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 20 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 21 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 22 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 23 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 24 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 25 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 26 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 27 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 28 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 29 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 30 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 31 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 32 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 33 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 34 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 35 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 36 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 37 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 38 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 39 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 40 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 41 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 42 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 43 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 44 + +#define ED_NUM_CHECKBUTTONS 45 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_INITIAL_GRAVITY #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -1349,6 +1349,19 @@ static struct ValueTextInfo options_wind_direction[] = { -1, NULL } }; +static struct ValueTextInfo options_player_speed[] = +{ + { 0, "frozen" }, + { 1, "very slow" }, + { 2, "slow" }, + { 4, "normal" }, + { 8, "fast" }, + { 16, "very fast" }, + { 32, "ultrafast" }, + + { -1, NULL } +}; + static struct ValueTextInfo options_access_type[] = { { EP_WALKABLE, "walkable" }, @@ -1752,11 +1765,50 @@ static struct ValueTextInfo options_action_arg_number[] = { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, { CA_ARG_UNDEFINED, " " }, - { CA_ARG_ELEMENT_HEADLINE, "[CE value" }, - { CA_ARG_ELEMENT_HEADLINE, " of" }, - { CA_ARG_ELEMENT_HEADLINE, " element]" }, - { CA_ARG_ELEMENT_TARGET, "target" }, - { CA_ARG_ELEMENT_TRIGGER, "trigger" }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_TARGET, "target" }, + { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_value[] = +{ + { CA_ARG_NUMBER_HEADLINE, "[number]" }, + { CA_ARG_0, "0" }, + { CA_ARG_1, "1" }, + { CA_ARG_2, "2" }, + { CA_ARG_3, "3" }, + { CA_ARG_4, "4" }, + { CA_ARG_5, "5" }, + { CA_ARG_10, "10" }, + { CA_ARG_100, "100" }, + { CA_ARG_1000, "1000" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_MIN, "min" }, + { CA_ARG_NUMBER_MAX, "max" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_RESET, "reset" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_CE_DELAY, "CE delay" }, + { CA_ARG_NUMBER_CE_SCORE, "CE score" }, + { CA_ARG_NUMBER_CE_VALUE, "CE value" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_LEVEL_TIME, "time" }, + { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, + { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_TARGET, "target" }, + { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_NR_HEADLINE, "[element]" }, + { CA_ARG_ELEMENT_NR_TARGET, "target" }, + { CA_ARG_ELEMENT_NR_TRIGGER, "trigger" }, { -1, NULL } }; @@ -1916,8 +1968,8 @@ action_arg_options[] = { CA_SET_PLAYER_SPEED, 1, options_action_arg_speed, }, { CA_SET_PLAYER_SHIELD, 1, options_action_arg_shield, }, { CA_SET_PLAYER_ARTWORK, 1, options_action_arg_artwork, }, - { CA_SET_CE_SCORE, 3, options_action_arg_number, }, - { CA_SET_CE_VALUE, 3, options_action_arg_number, }, + { CA_SET_CE_SCORE, 3, options_action_arg_value, }, + { CA_SET_CE_VALUE, 3, options_action_arg_value, }, { CA_SET_ENGINE_SCAN_MODE, 1, options_action_arg_scan_mode, }, { -1, FALSE, NULL } @@ -1963,6 +2015,15 @@ static struct /* ---------- element settings: configure (several elements) ------------- */ + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + GADGET_ID_PLAYER_SPEED, GADGET_ID_NONE, + -1, + options_player_speed, + &level.initial_player_stepsize, + "initial player speed:", NULL, "initial player speed" + }, + /* ---------- element settings: configure 1 (custom elements) ------------ */ { @@ -2428,7 +2489,7 @@ static struct "slip down from certain flat walls","use EM style slipping behaviour" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), GADGET_ID_USE_SPRING_BUG, GADGET_ID_NONE, &level.use_spring_bug, NULL, @@ -2462,13 +2523,6 @@ static struct NULL, "can grow into anything diggable", "grow into more than just sand" }, - { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), - GADGET_ID_DOUBLE_SPEED, GADGET_ID_NONE, - &level.double_speed, - NULL, - "double speed movement", "set initial movement speed of player" - }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), GADGET_ID_BLOCK_SNAP_FIELD, GADGET_ID_NONE, @@ -3297,14 +3351,15 @@ static int editor_el_emerald_mine_club[] = EL_SPRING, EL_EMC_SPRING_BUMPER, -#if 0 EL_EMC_DRIPPER, -#else - EL_EMPTY, -#endif EL_EMC_FAKE_GRASS, EL_EMPTY, EL_EMPTY, + + EL_EM_DYNAMITE, + EL_EM_DYNAMITE_ACTIVE, + EL_EMPTY, + EL_EMPTY, }; static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club; static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club; @@ -4149,9 +4204,9 @@ static int editor_el_custom[] = EL_CUSTOM_START + 254, EL_CUSTOM_START + 255, - EL_TRIGGER_ELEMENT, EL_TRIGGER_PLAYER, - EL_EMPTY, + EL_TRIGGER_ELEMENT, + EL_TRIGGER_CE_VALUE, EL_EMPTY }; static int *editor_hl_custom_ptr = editor_hl_custom; @@ -6308,8 +6363,12 @@ static void copy_custom_element_settings(int element_from, int element_to) ei_to->description[i] = ei_from->description[i]; /* ---------- copy element base properties ---------- */ +#if 1 + ei_to->properties[EP_BITFIELD_BASE] = ei_from->properties[EP_BITFIELD_BASE]; +#else Properties[element_to][EP_BITFIELD_BASE] = Properties[element_from][EP_BITFIELD_BASE]; +#endif /* ---------- copy custom property values ---------- */ @@ -7571,7 +7630,7 @@ static void DrawPropertiesInfo() #define TEXT_COLLECTING "Score for collecting" #define TEXT_SMASHING "Score for smashing" -#define TEXT_SLURPING "Score for slurping" +#define TEXT_SLURPING "Score for slurping robot" #define TEXT_CRACKING "Score for cracking" #define TEXT_AMOEBA_SPEED "Speed of amoeba growth" #define TEXT_DURATION "Duration when activated" @@ -7632,6 +7691,7 @@ static struct { EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING }, { EL_NUT, &level.score[SC_NUT], TEXT_CRACKING }, { EL_DYNAMITE, &level.score[SC_DYNAMITE], TEXT_COLLECTING }, + { EL_EM_DYNAMITE, &level.score[SC_DYNAMITE], TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE],TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_SIZE, &level.score[SC_DYNAMITE],TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_POWER, &level.score[SC_DYNAMITE],TEXT_COLLECTING }, @@ -7654,6 +7714,7 @@ static struct { EL_AMOEBA_DRY, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_BD_AMOEBA, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, + { EL_EMC_DRIPPER, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_MAGIC_WALL, &level.time_magic_wall, TEXT_DURATION }, { EL_BD_MAGIC_WALL, &level.time_magic_wall, TEXT_DURATION }, { EL_ROBOT_WHEEL, &level.time_wheel, TEXT_DURATION }, @@ -7681,7 +7742,7 @@ static struct { EL_EMC_MAGIC_BALL, &level.ball_time, TEXT_BALL_DELAY }, { EL_EMC_LENSES, &level.lenses_score, TEXT_COLLECTING }, { EL_EMC_MAGNIFIER, &level.magnify_score, TEXT_COLLECTING }, - { EL_ROBOT, &level.slurp_score, TEXT_SLURPING }, + { EL_SPRING, &level.slurp_score, TEXT_SLURPING }, { EL_EMC_LENSES, &level.lenses_time, TEXT_DURATION }, { EL_EMC_MAGNIFIER, &level.magnify_time, TEXT_DURATION }, #endif @@ -7814,11 +7875,12 @@ static void DrawPropertiesConfig() MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE); - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DOUBLE_SPEED); MapDrawingArea(ED_DRAWING_ID_START_ELEMENT); MapDrawingArea(ED_DRAWING_ID_ARTWORK_ELEMENT); MapDrawingArea(ED_DRAWING_ID_EXPLOSION_ELEMENT); + + MapSelectboxGadget(ED_SELECTBOX_ID_PLAYER_SPEED); } if (IS_GEM(properties_element)) @@ -9834,6 +9896,19 @@ void HandleLevelEditorKeyInput(Key key) button = MB_RIGHTBUTTON; break; + case KSYM_Home: + case KSYM_End: + element_shift = (key == KSYM_Home ? 0 : + num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS); + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, + element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END); + + ModifyEditorElementList(); + + break; + case KSYM_Escape: if (edit_mode == ED_MODE_DRAWING) {