X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=3c03f1323c64adc975809aaab26e02790b77c9be;hp=7a854200d554445d7c48545c228b303777795d49;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=5ac54645e6eeb1504a0743aa70cab93b63d232e5 diff --git a/src/editor.c b/src/editor.c index 7a854200..3c03f132 100644 --- a/src/editor.c +++ b/src/editor.c @@ -640,72 +640,75 @@ #define GADGET_ID_CHECKBUTTON_FIRST (GADGET_ID_SCROLLING_LIST_FIRST + 3) #define GADGET_ID_AUTO_COUNT_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 0) -#define GADGET_ID_RANDOM_PERCENTAGE (GADGET_ID_CHECKBUTTON_FIRST + 1) -#define GADGET_ID_RANDOM_QUANTITY (GADGET_ID_CHECKBUTTON_FIRST + 2) -#define GADGET_ID_RANDOM_RESTRICTED (GADGET_ID_CHECKBUTTON_FIRST + 3) -#define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 4) -#define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 5) -#define GADGET_ID_EM_EXPLODES_BY_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 6) -#define GADGET_ID_USE_SPRING_BUG (GADGET_ID_CHECKBUTTON_FIRST + 7) -#define GADGET_ID_USE_TIME_ORB_BUG (GADGET_ID_CHECKBUTTON_FIRST + 8) -#define GADGET_ID_RANDOM_BALL_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_INITIAL_BALL_STATE (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_AUTO_EXIT_SOKOBAN (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_CONTINUOUS_SNAPPING (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_SHIFTED_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_LAZY_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_INITIAL_GRAVITY (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_USE_INITIAL_INVENTORY (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_ENVELOPE_AUTOWRAP (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_ENVELOPE_CENTERED (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_MM_LASER_RED (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_MM_LASER_GREEN (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_MM_LASER_BLUE (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_DF_LASER_RED (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_DF_LASER_GREEN (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_DF_LASER_BLUE (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 39) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 40) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 41) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 42) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 43) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 44) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 45) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 46) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 47) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 48) -#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 49) -#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 50) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 51) -#define GADGET_ID_CUSTOM_USE_TEMPLATE_1 (GADGET_ID_CHECKBUTTON_FIRST + 52) -#define GADGET_ID_CUSTOM_USE_TEMPLATE_2 (GADGET_ID_CHECKBUTTON_FIRST + 53) -#define GADGET_ID_CUSTOM_USE_TEMPLATE_3 (GADGET_ID_CHECKBUTTON_FIRST + 54) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 55) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 56) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 57) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 58) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 59) -#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 60) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 61) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 62) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 63) +#define GADGET_ID_USE_LEVELSET_ARTWORK (GADGET_ID_CHECKBUTTON_FIRST + 1) +#define GADGET_ID_COPY_LEVEL_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 2) +#define GADGET_ID_RANDOM_PERCENTAGE (GADGET_ID_CHECKBUTTON_FIRST + 3) +#define GADGET_ID_RANDOM_QUANTITY (GADGET_ID_CHECKBUTTON_FIRST + 4) +#define GADGET_ID_RANDOM_RESTRICTED (GADGET_ID_CHECKBUTTON_FIRST + 5) +#define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 6) +#define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 7) +#define GADGET_ID_EM_EXPLODES_BY_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 8) +#define GADGET_ID_USE_SPRING_BUG (GADGET_ID_CHECKBUTTON_FIRST + 9) +#define GADGET_ID_USE_TIME_ORB_BUG (GADGET_ID_CHECKBUTTON_FIRST + 10) +#define GADGET_ID_RANDOM_BALL_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_INITIAL_BALL_STATE (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_AUTO_EXIT_SOKOBAN (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_SOLVED_BY_ONE_PLAYER (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_CONTINUOUS_SNAPPING (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_SHIFTED_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_LAZY_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_INITIAL_GRAVITY (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_USE_INITIAL_INVENTORY (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_ENVELOPE_AUTOWRAP (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_ENVELOPE_CENTERED (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_MM_LASER_RED (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_MM_LASER_GREEN (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_MM_LASER_BLUE (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_DF_LASER_RED (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_DF_LASER_GREEN (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_DF_LASER_BLUE (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 42) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 43) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 44) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 45) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 46) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 47) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 48) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 49) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 50) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 51) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 52) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 53) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 54) +#define GADGET_ID_CUSTOM_USE_TEMPLATE_1 (GADGET_ID_CHECKBUTTON_FIRST + 55) +#define GADGET_ID_CUSTOM_USE_TEMPLATE_2 (GADGET_ID_CHECKBUTTON_FIRST + 56) +#define GADGET_ID_CUSTOM_USE_TEMPLATE_3 (GADGET_ID_CHECKBUTTON_FIRST + 57) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 58) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 59) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 60) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 61) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 62) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 63) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 64) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 65) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 66) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 64) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 67) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -907,73 +910,79 @@ /* values for checkbutton gadgets */ #define ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS 0 -#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 1 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3 2 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2 3 -#define ED_CHECKBUTTON_ID_STICK_ELEMENT 4 -#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 5 -#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE 6 -#define ED_CHECKBUTTON_ID_USE_SPRING_BUG 7 -#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG 8 -#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT 9 -#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE 10 -#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 11 -#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN 12 -#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING 13 -#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 14 -#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 15 -#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 16 -#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 17 -#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION 18 -#define ED_CHECKBUTTON_ID_LAZY_RELOCATION 19 -#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 20 -#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 21 -#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 22 -#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY 23 -#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY 24 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 25 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 26 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 27 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 28 -#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP 29 -#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED 30 -#define ED_CHECKBUTTON_ID_MM_LASER_RED 31 -#define ED_CHECKBUTTON_ID_MM_LASER_GREEN 32 -#define ED_CHECKBUTTON_ID_MM_LASER_BLUE 33 -#define ED_CHECKBUTTON_ID_DF_LASER_RED 34 -#define ED_CHECKBUTTON_ID_DF_LASER_GREEN 35 -#define ED_CHECKBUTTON_ID_DF_LASER_BLUE 36 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 37 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1 38 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 39 -#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 40 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 41 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 42 -#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 43 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 44 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 45 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 46 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 47 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 48 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 49 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 50 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 51 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 52 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 53 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 54 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 55 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 56 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 57 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 58 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 59 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 60 -#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 61 - -#define ED_NUM_CHECKBUTTONS 62 +#define ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK 1 +#define ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE 2 +#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 3 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3 4 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2 5 +#define ED_CHECKBUTTON_ID_STICK_ELEMENT 6 +#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 7 +#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE 8 +#define ED_CHECKBUTTON_ID_USE_SPRING_BUG 9 +#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG 10 +#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT 11 +#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE 12 +#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 13 +#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN 14 +#define ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER 15 +#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING 16 +#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 17 +#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 18 +#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 19 +#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 20 +#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION 21 +#define ED_CHECKBUTTON_ID_LAZY_RELOCATION 22 +#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 23 +#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 24 +#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 25 +#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY 26 +#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY 27 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 28 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 29 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 30 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 31 +#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP 32 +#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED 33 +#define ED_CHECKBUTTON_ID_MM_LASER_RED 34 +#define ED_CHECKBUTTON_ID_MM_LASER_GREEN 35 +#define ED_CHECKBUTTON_ID_MM_LASER_BLUE 36 +#define ED_CHECKBUTTON_ID_DF_LASER_RED 37 +#define ED_CHECKBUTTON_ID_DF_LASER_GREEN 38 +#define ED_CHECKBUTTON_ID_DF_LASER_BLUE 39 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 40 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1 41 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 42 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 43 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 44 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 45 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 46 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 47 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 48 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 49 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 50 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 51 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 52 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 53 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 54 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 55 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 56 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 57 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 58 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 59 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 60 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 61 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 62 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 63 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 64 + +#define ED_NUM_CHECKBUTTONS 65 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS +#define ED_CHECKBUTTON_ID_LEVELSET_FIRST ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK +#define ED_CHECKBUTTON_ID_LEVELSET_LAST ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE + #define ED_CHECKBUTTON_ID_EDITOR_FIRST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED #define ED_CHECKBUTTON_ID_EDITOR_LAST ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2 @@ -1302,6 +1311,8 @@ static struct ElementInfo custom_element; static char levelset_name[MAX_LEVEL_NAME_LEN + 1]; static char levelset_author[MAX_LEVEL_AUTHOR_LEN + 1]; static int levelset_num_levels = 100; +static boolean levelset_use_levelset_artwork = FALSE; +static boolean levelset_copy_level_template = FALSE; static int levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE; static struct @@ -2422,7 +2433,7 @@ static struct NULL, "game engine:", NULL, "game engine" }, { - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(9), + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(10), GADGET_ID_LEVELSET_SAVE_MODE, GADGET_ID_NONE, -1, options_levelset_save_mode, @@ -2732,7 +2743,7 @@ static struct /* ---------- level and editor settings (buttons) ------------------------ */ { - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(9), + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(10), GADGET_ID_SAVE_LEVELSET, GADGET_ID_LEVELSET_SAVE_MODE, -1, "Save", NULL, NULL, NULL, "Update or create level set" @@ -2929,6 +2940,20 @@ static struct NULL, NULL, "automatically count gems needed", "set counter to number of gems" }, + { + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(7), + GADGET_ID_USE_LEVELSET_ARTWORK, GADGET_ID_NONE, + &levelset_use_levelset_artwork, + NULL, NULL, + "use current custom artwork", "use custom artwork of this level set" + }, + { + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(8), + GADGET_ID_COPY_LEVEL_TEMPLATE, GADGET_ID_NONE, + &levelset_copy_level_template, + NULL, NULL, + "copy current level template", "copy level template of this level set" + }, { ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(1), GADGET_ID_RANDOM_RESTRICTED, GADGET_ID_NONE, @@ -3016,6 +3041,13 @@ static struct NULL, NULL, "exit level if all fields solved", "automatically finish Sokoban levels" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(14), + GADGET_ID_SOLVED_BY_ONE_PLAYER, GADGET_ID_NONE, + &level.solved_by_one_player, + NULL, NULL, + "only one player must enter exit", "level solved by first player in exit" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(9), GADGET_ID_CONTINUOUS_SNAPPING, GADGET_ID_NONE, @@ -3721,19 +3753,18 @@ static void ModifyEditorCounterLimits(int, int, int); static void ModifyEditorSelectboxValue(int, int); static void ModifyEditorSelectboxOptions(int, struct ValueTextInfo *); static void ModifyEditorDrawingArea(int, int, int); -static void ModifyEditorElementList(); -static void AdjustElementListScrollbar(); -static void RedrawDrawingElements(); +static void ModifyEditorElementList(void); +static void AdjustElementListScrollbar(void); +static void RedrawDrawingElements(void); static void DrawDrawingWindowExt(boolean); -static void DrawDrawingWindow(); -static void DrawDrawingWindow_PlayfieldOnly(); -static void DrawLevelInfoWindow(); -static void DrawPropertiesWindow(); -static void DrawPaletteWindow(); -static void UpdateCustomElementGraphicGadgets(); +static void DrawDrawingWindow(void); +static void DrawLevelInfoWindow(void); +static void DrawPropertiesWindow(void); +static void DrawPaletteWindow(void); +static void UpdateCustomElementGraphicGadgets(void); static boolean checkPropertiesConfig(int); -static void SetAutomaticNumberOfGemsNeeded(); -static void ClearEditorGadgetInfoText(); +static void SetAutomaticNumberOfGemsNeeded(void); +static void ClearEditorGadgetInfoText(void); static void CopyLevelToUndoBuffer(int); static void HandleDrawingAreas(struct GadgetInfo *); static void HandleCounterButtons(struct GadgetInfo *); @@ -3747,11 +3778,11 @@ static void HandleCheckbuttons(struct GadgetInfo *); static void HandleControlButtons(struct GadgetInfo *); static void HandleDrawingAreaInfo(struct GadgetInfo *); static void PrintEditorGadgetInfoText(struct GadgetInfo *); -static boolean AskToCopyAndModifyLevelTemplate(); -static boolean getDrawModeHiRes(); -static int getTabulatorBarWidth(); -static int getTabulatorBarHeight(); -static Pixel getTabulatorBarColor(); +static boolean AskToCopyAndModifyLevelTemplate(void); +static boolean getDrawModeHiRes(void); +static int getTabulatorBarWidth(void); +static int getTabulatorBarHeight(void); +static Pixel getTabulatorBarColor(void); static int num_editor_gadgets = 0; /* dynamically determined */ @@ -3784,7 +3815,7 @@ static int editor_el_players[] = EL_PLAYER_4 }; static int *editor_el_players_ptr = editor_el_players; -static int num_editor_el_players = SIZEOF_ARRAY_INT(editor_el_players); +static int num_editor_el_players = ARRAY_SIZE(editor_el_players); static int editor_hl_boulderdash[] = { @@ -3823,8 +3854,8 @@ static int editor_el_boulderdash[] = }; static int *editor_hl_boulderdash_ptr = editor_hl_boulderdash; static int *editor_el_boulderdash_ptr = editor_el_boulderdash; -static int num_editor_hl_boulderdash = SIZEOF_ARRAY_INT(editor_hl_boulderdash); -static int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash); +static int num_editor_hl_boulderdash = ARRAY_SIZE(editor_hl_boulderdash); +static int num_editor_el_boulderdash = ARRAY_SIZE(editor_el_boulderdash); static int editor_hl_emerald_mine[] = { @@ -3851,12 +3882,12 @@ static int editor_el_emerald_mine[] = EL_NUT, EL_BOMB, - EL_WALL_EMERALD, - EL_WALL_DIAMOND, - EL_DYNAMITE, - EL_DYNAMITE_ACTIVE, + EL_EM_DYNAMITE, + EL_EM_DYNAMITE_ACTIVE, + EL_EM_EXIT_CLOSED, + EL_EM_EXIT_OPEN, - EL_YAMYAM, + EL_YAMYAM_UP, EL_BUG_UP, EL_SPACESHIP_UP, EL_ROBOT, @@ -3895,16 +3926,11 @@ static int editor_el_emerald_mine[] = EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, - - EL_EM_EXIT_CLOSED, - EL_EM_EXIT_OPEN, - EL_EM_STEEL_EXIT_CLOSED, - EL_EM_STEEL_EXIT_OPEN, }; static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine; static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine; -static int num_editor_hl_emerald_mine=SIZEOF_ARRAY_INT(editor_hl_emerald_mine); -static int num_editor_el_emerald_mine=SIZEOF_ARRAY_INT(editor_el_emerald_mine); +static int num_editor_hl_emerald_mine = ARRAY_SIZE(editor_hl_emerald_mine); +static int num_editor_el_emerald_mine = ARRAY_SIZE(editor_el_emerald_mine); static int editor_hl_emerald_mine_club[] = { @@ -3973,8 +3999,8 @@ static int editor_el_emerald_mine_club[] = EL_EMC_LENSES, EL_EMC_MAGNIFIER, - EL_EM_DYNAMITE, - EL_EM_DYNAMITE_ACTIVE, + EL_EMPTY, + EL_EMPTY, EL_BALLOON, EL_YAMYAM_UP, @@ -3993,8 +4019,8 @@ static int editor_el_emerald_mine_club[] = }; 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; -static int num_editor_hl_emerald_mine_club=SIZEOF_ARRAY_INT(editor_hl_emerald_mine_club); -static int num_editor_el_emerald_mine_club=SIZEOF_ARRAY_INT(editor_el_emerald_mine_club); +static int num_editor_hl_emerald_mine_club = ARRAY_SIZE(editor_hl_emerald_mine_club); +static int num_editor_el_emerald_mine_club = ARRAY_SIZE(editor_el_emerald_mine_club); static int editor_hl_rnd[] = { @@ -4006,6 +4032,11 @@ static int editor_hl_rnd[] = static int editor_el_rnd[] = { + EL_DYNAMITE, /* RND */ + EL_DYNAMITE_ACTIVE, /* RND */ + EL_EMPTY, + EL_EMPTY, + EL_KEY_1, EL_KEY_2, EL_KEY_3, @@ -4049,7 +4080,7 @@ static int editor_el_rnd[] = EL_PACMAN_LEFT, EL_DARK_YAMYAM, EL_PACMAN_RIGHT, - EL_EMPTY, + EL_YAMYAM, /* RND */ EL_BLACK_ORB, EL_PACMAN_DOWN, @@ -4088,8 +4119,8 @@ static int editor_el_rnd[] = }; static int *editor_hl_rnd_ptr = editor_hl_rnd; static int *editor_el_rnd_ptr = editor_el_rnd; -static int num_editor_hl_rnd = SIZEOF_ARRAY_INT(editor_hl_rnd); -static int num_editor_el_rnd = SIZEOF_ARRAY_INT(editor_el_rnd); +static int num_editor_hl_rnd = ARRAY_SIZE(editor_hl_rnd); +static int num_editor_el_rnd = ARRAY_SIZE(editor_el_rnd); static int editor_hl_sokoban[] = { @@ -4108,8 +4139,8 @@ static int editor_el_sokoban[] = }; static int *editor_hl_sokoban_ptr = editor_hl_sokoban; static int *editor_el_sokoban_ptr = editor_el_sokoban; -static int num_editor_hl_sokoban = SIZEOF_ARRAY_INT(editor_hl_sokoban); -static int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban); +static int num_editor_hl_sokoban = ARRAY_SIZE(editor_hl_sokoban); +static int num_editor_el_sokoban = ARRAY_SIZE(editor_el_sokoban); static int editor_hl_supaplex[] = { @@ -4183,8 +4214,8 @@ static int editor_el_supaplex[] = }; static int *editor_hl_supaplex_ptr = editor_hl_supaplex; static int *editor_el_supaplex_ptr = editor_el_supaplex; -static int num_editor_hl_supaplex = SIZEOF_ARRAY_INT(editor_hl_supaplex); -static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex); +static int num_editor_hl_supaplex = ARRAY_SIZE(editor_hl_supaplex); +static int num_editor_el_supaplex = ARRAY_SIZE(editor_el_supaplex); static int editor_hl_diamond_caves[] = { @@ -4196,6 +4227,11 @@ static int editor_hl_diamond_caves[] = static int editor_el_diamond_caves[] = { + EL_EM_STEEL_EXIT_CLOSED, /* DC2 */ + EL_EM_STEEL_EXIT_OPEN, /* DC2 */ + EL_WALL_EMERALD, /* DC2 */ + EL_WALL_DIAMOND, /* DC2 */ + EL_PEARL, EL_CRYSTAL, EL_WALL_PEARL, @@ -4340,8 +4376,8 @@ static int editor_el_diamond_caves[] = }; static int *editor_hl_diamond_caves_ptr = editor_hl_diamond_caves; static int *editor_el_diamond_caves_ptr = editor_el_diamond_caves; -static int num_editor_hl_diamond_caves = SIZEOF_ARRAY_INT(editor_hl_diamond_caves); -static int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves); +static int num_editor_hl_diamond_caves = ARRAY_SIZE(editor_hl_diamond_caves); +static int num_editor_el_diamond_caves = ARRAY_SIZE(editor_el_diamond_caves); static int editor_hl_dx_boulderdash[] = { @@ -4375,8 +4411,8 @@ static int editor_el_dx_boulderdash[] = }; static int *editor_hl_dx_boulderdash_ptr = editor_hl_dx_boulderdash; static int *editor_el_dx_boulderdash_ptr = editor_el_dx_boulderdash; -static int num_editor_hl_dx_boulderdash = SIZEOF_ARRAY_INT(editor_hl_dx_boulderdash); -static int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash); +static int num_editor_hl_dx_boulderdash = ARRAY_SIZE(editor_hl_dx_boulderdash); +static int num_editor_el_dx_boulderdash = ARRAY_SIZE(editor_el_dx_boulderdash); static int editor_hl_mirror_magic[] = { @@ -4395,13 +4431,13 @@ static int editor_el_mirror_magic[] = EL_MM_MIRROR_START, EL_MM_MIRROR_FIXED_START, - EL_MM_POLARISATOR_START, - EL_MM_POLARISATOR_CROSS_START, + EL_MM_POLARIZER_START, + EL_MM_POLARIZER_CROSS_START, - EL_MM_BEAMER_RED_START, - EL_MM_BEAMER_YELLOW_START, - EL_MM_BEAMER_GREEN_START, - EL_MM_BEAMER_BLUE_START, + EL_MM_TELEPORTER_RED_START, + EL_MM_TELEPORTER_YELLOW_START, + EL_MM_TELEPORTER_GREEN_START, + EL_MM_TELEPORTER_BLUE_START, EL_MM_PRISM, EL_MM_FUSE_ACTIVE, @@ -4440,8 +4476,8 @@ static int editor_el_mirror_magic[] = }; static int *editor_hl_mirror_magic_ptr = editor_hl_mirror_magic; static int *editor_el_mirror_magic_ptr = editor_el_mirror_magic; -static int num_editor_hl_mirror_magic = SIZEOF_ARRAY_INT(editor_hl_mirror_magic); -static int num_editor_el_mirror_magic = SIZEOF_ARRAY_INT(editor_el_mirror_magic); +static int num_editor_hl_mirror_magic = ARRAY_SIZE(editor_hl_mirror_magic); +static int num_editor_el_mirror_magic = ARRAY_SIZE(editor_el_mirror_magic); static int editor_hl_deflektor[] = { @@ -4485,8 +4521,8 @@ static int editor_el_deflektor[] = }; static int *editor_hl_deflektor_ptr = editor_hl_deflektor; static int *editor_el_deflektor_ptr = editor_el_deflektor; -static int num_editor_hl_deflektor = SIZEOF_ARRAY_INT(editor_hl_deflektor); -static int num_editor_el_deflektor = SIZEOF_ARRAY_INT(editor_el_deflektor); +static int num_editor_hl_deflektor = ARRAY_SIZE(editor_hl_deflektor); +static int num_editor_el_deflektor = ARRAY_SIZE(editor_el_deflektor); static int editor_hl_chars[] = { @@ -4595,8 +4631,8 @@ static int editor_el_chars[] = }; static int *editor_hl_chars_ptr = editor_hl_chars; static int *editor_el_chars_ptr = editor_el_chars; -static int num_editor_hl_chars = SIZEOF_ARRAY_INT(editor_hl_chars); -static int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars); +static int num_editor_hl_chars = ARRAY_SIZE(editor_hl_chars); +static int num_editor_el_chars = ARRAY_SIZE(editor_el_chars); static int editor_hl_steel_chars[] = { @@ -4705,8 +4741,8 @@ static int editor_el_steel_chars[] = }; static int *editor_hl_steel_chars_ptr = editor_hl_steel_chars; static int *editor_el_steel_chars_ptr = editor_el_steel_chars; -static int num_editor_hl_steel_chars = SIZEOF_ARRAY_INT(editor_hl_steel_chars); -static int num_editor_el_steel_chars = SIZEOF_ARRAY_INT(editor_el_steel_chars); +static int num_editor_hl_steel_chars = ARRAY_SIZE(editor_hl_steel_chars); +static int num_editor_el_steel_chars = ARRAY_SIZE(editor_el_steel_chars); static int editor_hl_custom[] = { @@ -5040,8 +5076,8 @@ static int editor_el_custom[] = }; static int *editor_hl_custom_ptr = editor_hl_custom; static int *editor_el_custom_ptr = editor_el_custom; -static int num_editor_hl_custom = SIZEOF_ARRAY_INT(editor_hl_custom); -static int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom); +static int num_editor_hl_custom = ARRAY_SIZE(editor_hl_custom); +static int num_editor_el_custom = ARRAY_SIZE(editor_el_custom); static int editor_hl_group[] = { @@ -5095,8 +5131,8 @@ static int editor_el_group[] = }; static int *editor_hl_group_ptr = editor_hl_group; static int *editor_el_group_ptr = editor_el_group; -static int num_editor_hl_group = SIZEOF_ARRAY_INT(editor_hl_group); -static int num_editor_el_group = SIZEOF_ARRAY_INT(editor_el_group); +static int num_editor_hl_group = ARRAY_SIZE(editor_hl_group); +static int num_editor_el_group = ARRAY_SIZE(editor_el_group); static int editor_hl_reference[] = { @@ -5140,8 +5176,8 @@ static int editor_el_reference[] = }; static int *editor_hl_reference_ptr = editor_hl_reference; static int *editor_el_reference_ptr = editor_el_reference; -static int num_editor_hl_reference = SIZEOF_ARRAY_INT(editor_hl_reference); -static int num_editor_el_reference = SIZEOF_ARRAY_INT(editor_el_reference); +static int num_editor_hl_reference = ARRAY_SIZE(editor_hl_reference); +static int num_editor_el_reference = ARRAY_SIZE(editor_el_reference); static int editor_hl_user_defined[] = { @@ -5153,7 +5189,7 @@ static int editor_hl_user_defined[] = static int *editor_hl_user_defined_ptr = editor_hl_user_defined; static int *editor_el_user_defined_ptr = NULL; -static int num_editor_hl_user_defined=SIZEOF_ARRAY_INT(editor_hl_user_defined); +static int num_editor_hl_user_defined = ARRAY_SIZE(editor_hl_user_defined); static int num_editor_el_user_defined = 0; static int editor_hl_dynamic[] = @@ -5166,7 +5202,7 @@ static int editor_hl_dynamic[] = static int *editor_hl_dynamic_ptr = editor_hl_dynamic; static int *editor_el_dynamic_ptr = NULL; -static int num_editor_hl_dynamic = SIZEOF_ARRAY_INT(editor_hl_dynamic); +static int num_editor_hl_dynamic = ARRAY_SIZE(editor_hl_dynamic); static int num_editor_el_dynamic = 0; static int editor_hl_empty[] = { EL_EMPTY }; @@ -5349,7 +5385,7 @@ editor_elements_info[] = ----------------------------------------------------------------------------- */ -static int getMaxInfoTextLength() +static int getMaxInfoTextLength(void) { return (SXSIZE / getFontWidth(INFOTEXT_FONT)); } @@ -5441,7 +5477,7 @@ char *getElementDescriptionFilename(int element) return NULL; } -static boolean suppressBorderElement() +static boolean suppressBorderElement(void) { return (level.game_engine_type == GAME_ENGINE_TYPE_MM && lev_fieldx <= MAX_ED_FIELDX && @@ -5495,7 +5531,7 @@ static void InitDynamicEditorElementList(int **elements, int *num_elements) (*elements)[(*num_elements)++] = EL_EMPTY; } -static void ReinitializeElementList_EnableSections() +static void ReinitializeElementList_EnableSections(void) { /* default: enable all element sections */ @@ -5604,7 +5640,7 @@ static void ReinitializeElementList_EnableSections() } } -static void ReinitializeElementList() +static void ReinitializeElementList(void) { static boolean initialization_needed = TRUE; int pos = 0; @@ -5763,7 +5799,7 @@ static void ReinitializeElementList() AdjustElementListScrollbar(); } -void PrintEditorElementList() +void PrintEditorElementList(void) { boolean *stop = &setup_editor_el_user_defined; int i, j; @@ -5807,7 +5843,7 @@ void PrintEditorElementList() } } -static void ReinitializeElementListButtons() +static void ReinitializeElementListButtons(void) { static boolean last_setup_value_headlines = FALSE; static boolean initialization_needed = TRUE; @@ -5908,7 +5944,7 @@ static void DrawEditorLevelBorderLine(int x, int y, int xsize, int ysize) FillRectangle(drawto, SX + x, SY + y, xsize_thin, ysize_thin, BLACK_PIXEL); } -static void DrawEditorLevelBorderLinesIfNeeded() +static void DrawEditorLevelBorderLinesIfNeeded(void) { int xsize = lev_fieldx * ed_tilesize; int ysize = lev_fieldy * ed_tilesize; @@ -6005,7 +6041,7 @@ void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap, getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y); } -static void CreateControlButtons() +static void CreateControlButtons(void) { struct GadgetInfo *gi; int i; @@ -6097,6 +6133,7 @@ static void CreateControlButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, controlbutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -6171,6 +6208,7 @@ static void CreateControlButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, scrollbutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -6219,6 +6257,7 @@ static void CreateControlButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, getElementInfoText(element), GDI_X, x, GDI_Y, y, @@ -6244,7 +6283,7 @@ static void CreateControlButtons() } } -static void CreateCounterButtons() +static void CreateCounterButtons(void) { int max_infotext_len = getMaxInfoTextLength(); int i; @@ -6316,6 +6355,7 @@ static void CreateCounterButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, infotext, GDI_X, x, GDI_Y, y, @@ -6372,6 +6412,7 @@ static void CreateCounterButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, "enter counter value", GDI_X, x, GDI_Y, y, @@ -6404,7 +6445,7 @@ static void CreateCounterButtons() } } -static void CreateDrawingAreas() +static void CreateDrawingAreas(void) { int i; @@ -6458,7 +6499,7 @@ static void CreateDrawingAreas() } } -static void CreateTextInputGadgets() +static void CreateTextInputGadgets(void) { struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT]; int max_infotext_len = getMaxInfoTextLength(); @@ -6529,7 +6570,7 @@ static void CreateTextInputGadgets() } } -static void CreateTextAreaGadgets() +static void CreateTextAreaGadgets(void) { int max_infotext_len = getMaxInfoTextLength(); int i; @@ -6578,7 +6619,7 @@ static void CreateTextAreaGadgets() } } -static void CreateSelectboxGadgets() +static void CreateSelectboxGadgets(void) { int max_infotext_len = getMaxInfoTextLength(); int i, j; @@ -6659,7 +6700,7 @@ static void CreateSelectboxGadgets() } } -static void CreateTextbuttonGadgets() +static void CreateTextbuttonGadgets(void) { int max_infotext_len = getMaxInfoTextLength(); int i; @@ -6714,6 +6755,7 @@ static void CreateTextbuttonGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, infotext, GDI_X, x, GDI_Y, y, @@ -6742,7 +6784,7 @@ static void CreateTextbuttonGadgets() } } -static void CreateGraphicbuttonGadgets() +static void CreateGraphicbuttonGadgets(void) { struct GadgetInfo *gi; unsigned int event_mask; @@ -6754,7 +6796,8 @@ static void CreateGraphicbuttonGadgets() int id = graphicbutton_info[i].gadget_id; int x = SX + ED_SETTINGS_X(graphicbutton_info[i].x); int y = SY + ED_SETTINGS_Y(graphicbutton_info[i].y); - struct GraphicInfo *gd = &graphic_info[graphicbutton_info[i].graphic]; + int graphic = graphicbutton_info[i].graphic; + struct GraphicInfo *gd = &graphic_info[graphic]; int gd_x1 = gd->src_x; int gd_y1 = gd->src_y; int gd_x2 = gd->src_x + gd->pressed_xoffset; @@ -6773,6 +6816,7 @@ static void CreateGraphicbuttonGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, graphicbutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -6796,7 +6840,7 @@ static void CreateGraphicbuttonGadgets() } } -static void CreateScrollbarGadgets() +static void CreateScrollbarGadgets(void) { int i; @@ -6879,6 +6923,7 @@ static void CreateScrollbarGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, scrollbar_info[i].infotext, GDI_X, scrollbar_pos[i].x, GDI_Y, scrollbar_pos[i].y, @@ -6908,7 +6953,7 @@ static void CreateScrollbarGadgets() } } -static void CreateCheckbuttonGadgets() +static void CreateCheckbuttonGadgets(void) { struct GadgetInfo *gi; unsigned int event_mask; @@ -6944,6 +6989,7 @@ static void CreateCheckbuttonGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, checkbutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -6969,9 +7015,10 @@ static void CreateCheckbuttonGadgets() } } -static void CreateRadiobuttonGadgets() +static void CreateRadiobuttonGadgets(void) { - struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_RADIOBUTTON]; + int graphic = IMG_EDITOR_RADIOBUTTON; + struct GraphicInfo *gd = &graphic_info[graphic]; int gd_x1 = gd->src_x; int gd_y1 = gd->src_y; int gd_x2 = gd->src_x + gd->pressed_xoffset; @@ -7006,6 +7053,7 @@ static void CreateRadiobuttonGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, radiobutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -7032,7 +7080,7 @@ static void CreateRadiobuttonGadgets() } } -void CreateLevelEditorGadgets() +void CreateLevelEditorGadgets(void) { /* force EDITOR font inside level editor */ SetFontStatus(GAME_MODE_EDITOR); @@ -7074,7 +7122,7 @@ void CreateLevelEditorGadgets() ResetFontStatus(); } -void FreeLevelEditorGadgets() +void FreeLevelEditorGadgets(void) { int i; @@ -7151,7 +7199,7 @@ static void MapCounterButtons(int id) MapGadget(gi_up); } -static void MapControlButtons() +static void MapControlButtons(void) { int counter_id; int i; @@ -7394,7 +7442,7 @@ static void MapCheckbuttonGadget(int id) MapGadget(gi); } -static void MapMainDrawingArea() +static void MapMainDrawingArea(void) { boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx); boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy); @@ -7451,12 +7499,12 @@ static void MapOrUnmapLevelEditorToolboxCustomGadgets(boolean map) } } -static void MapLevelEditorToolboxCustomGadgets() +static void MapLevelEditorToolboxCustomGadgets(void) { MapOrUnmapLevelEditorToolboxCustomGadgets(TRUE); } -static void UnmapLevelEditorToolboxCustomGadgets() +static void UnmapLevelEditorToolboxCustomGadgets(void) { MapOrUnmapLevelEditorToolboxCustomGadgets(FALSE); } @@ -7492,12 +7540,12 @@ static void MapOrUnmapLevelEditorToolboxDrawingGadgets(boolean map) } } -static void MapLevelEditorToolboxDrawingGadgets() +static void MapLevelEditorToolboxDrawingGadgets(void) { MapOrUnmapLevelEditorToolboxDrawingGadgets(TRUE); } -static void UnmapLevelEditorToolboxDrawingGadgets() +static void UnmapLevelEditorToolboxDrawingGadgets(void) { MapOrUnmapLevelEditorToolboxDrawingGadgets(FALSE); } @@ -7507,7 +7555,7 @@ static void UnmapDrawingArea(int id) UnmapGadget(level_editor_gadget[drawingarea_info[id].gadget_id]); } -static void UnmapLevelEditorFieldGadgets() +static void UnmapLevelEditorFieldGadgets(void) { int i; @@ -7517,7 +7565,7 @@ static void UnmapLevelEditorFieldGadgets() UnmapGadget(level_editor_gadget[i]); } -void UnmapLevelEditorGadgets() +void UnmapLevelEditorGadgets(void) { int i; @@ -7525,7 +7573,7 @@ void UnmapLevelEditorGadgets() UnmapGadget(level_editor_gadget[i]); } -static void ResetUndoBuffer() +static void ResetUndoBuffer(void) { undo_buffer_position = -1; undo_buffer_steps = -1; @@ -7536,10 +7584,13 @@ static void ResetUndoBuffer() level.changed = FALSE; } -static void DrawEditModeWindow() +static void DrawEditModeWindowExt(boolean remap_toolbox_gadgets) { - ModifyEditorElementList(); - RedrawDrawingElements(); + if (remap_toolbox_gadgets) + { + ModifyEditorElementList(); + RedrawDrawingElements(); + } if (edit_mode == ED_MODE_INFO) DrawLevelInfoWindow(); @@ -7548,7 +7599,17 @@ static void DrawEditModeWindow() else if (edit_mode == ED_MODE_PALETTE) DrawPaletteWindow(); else /* edit_mode == ED_MODE_DRAWING */ - DrawDrawingWindow(); + DrawDrawingWindowExt(remap_toolbox_gadgets); +} + +static void DrawEditModeWindow(void) +{ + DrawEditModeWindowExt(TRUE); +} + +static void DrawEditModeWindow_PlayfieldOnly(void) +{ + DrawEditModeWindowExt(FALSE); } static void ChangeEditModeWindow(int new_edit_mode) @@ -7558,7 +7619,7 @@ static void ChangeEditModeWindow(int new_edit_mode) DrawEditModeWindow(); } -static boolean LevelChanged() +static boolean LevelChanged(void) { boolean field_changed = FALSE; int x, y; @@ -7571,7 +7632,7 @@ static boolean LevelChanged() return (level.changed || field_changed); } -static boolean PrepareSavingIntoPersonalLevelSet() +static boolean PrepareSavingIntoPersonalLevelSet(void) { static LevelDirTree *last_copied_leveldir = NULL; static LevelDirTree *last_written_leveldir = NULL; @@ -7713,7 +7774,7 @@ static int setSelectboxValue(int selectbox_id, int new_value) return new_index_value; } -static void setSelectboxSpecialActionVariablesIfNeeded() +static void setSelectboxSpecialActionVariablesIfNeeded(void) { int i; @@ -7739,7 +7800,7 @@ static void setSelectboxSpecialActionVariablesIfNeeded() } } -static void setSelectboxSpecialActionOptions() +static void setSelectboxSpecialActionOptions(void) { int i; @@ -8071,7 +8132,7 @@ static void CopyElementPropertiesToEditor(int element) CopyClassicElementPropertiesToEditor(element); } -static boolean AskToCopyAndModifyLevelTemplate() +static boolean AskToCopyAndModifyLevelTemplate(void) { if (Request("Copy and modify settings from level template?", REQ_ASK)) { @@ -8247,7 +8308,7 @@ static void CopyElementPropertiesToGame(int element) CopyClassicElementPropertiesToGame(element); } -void CheckElementDescriptions() +void CheckElementDescriptions(void) { int i; @@ -8279,7 +8340,9 @@ static int getMaxEdFieldY(boolean has_scrollbar) void InitZoomLevelSettings(int zoom_tilesize) { - if (zoom_tilesize == -1) + static int last_game_engine_type = GAME_ENGINE_TYPE_UNKNOWN; + + if (zoom_tilesize == -1 && level.game_engine_type != last_game_engine_type) { ed_tilesize = setup.auto_setup.editor_zoom_tilesize; ed_tilesize_default = DEFAULT_EDITOR_TILESIZE; @@ -8291,6 +8354,8 @@ void InitZoomLevelSettings(int zoom_tilesize) } } + last_game_engine_type = level.game_engine_type; + // limit zoom tilesize by upper and lower bound ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE); @@ -8302,7 +8367,7 @@ void InitZoomLevelSettings(int zoom_tilesize) MAX_ED_FIELDY = getMaxEdFieldY(FALSE); } -static void InitDrawingElements() +static void InitDrawingElements(void) { static int game_engine_type_last = GAME_ENGINE_TYPE_UNKNOWN; @@ -8331,7 +8396,7 @@ static void InitDrawingElements() game_engine_type_last = level.game_engine_type; } -static void InitLevelSetInfo() +static void InitLevelSetInfo(void) { snprintf(levelset_name, MAX_LEVEL_NAME_LEN + 1, "%s", leveldir_current->name); @@ -8340,6 +8405,9 @@ static void InitLevelSetInfo() levelset_num_levels = leveldir_current->levels; + levelset_use_levelset_artwork = FALSE; + levelset_copy_level_template = FALSE; + levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE; } @@ -8363,7 +8431,7 @@ static void ChangeEditorToLevelSet(char *levelset_subdir) DrawLevelEd(); } -static boolean useEditorDoorAnimation() +static boolean useEditorDoorAnimation(void) { struct RectWithBorder *vp_door_1 = &viewport.door_1[GAME_MODE_MAIN]; boolean door_1_viewport_unchanged = @@ -8380,7 +8448,7 @@ static boolean useEditorDoorAnimation() return (door_1_viewport_unchanged && door_1_contains_toolbox); } -void DrawEditorDoorContent() +void DrawEditorDoorContent(void) { /* needed for gadgets drawn on background (like palette scrollbar) */ SetDoorBackgroundImage(IMG_UNDEFINED); @@ -8415,7 +8483,7 @@ void DrawEditorDoorContent() BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); } -void DrawLevelEd() +void DrawLevelEd(void) { int fade_mask = REDRAW_FIELD; @@ -8470,7 +8538,7 @@ void DrawLevelEd() UnmapAllGadgets(); - DrawDrawingWindow_PlayfieldOnly(); + DrawEditModeWindow_PlayfieldOnly(); DrawMaskedBorder(fade_mask); @@ -8493,7 +8561,7 @@ void DrawLevelEd() SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2); } -static void AdjustDrawingAreaGadgets() +static void AdjustDrawingAreaGadgets(void) { int ed_xsize = lev_fieldx + 2; int ed_ysize = lev_fieldy + 2; @@ -8569,7 +8637,7 @@ static void AdjustDrawingAreaGadgets() GDI_END); } -static void AdjustLevelScrollPosition() +static void AdjustLevelScrollPosition(void) { if (level_xpos < -1) level_xpos = -1; @@ -8617,7 +8685,7 @@ static void AdjustEditorScrollbar(int id) GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); } -static void AdjustElementListScrollbar() +static void AdjustElementListScrollbar(void) { struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]; int items_max, items_visible, item_position; @@ -8701,7 +8769,7 @@ static void ModifyEditorDrawingArea(int drawingarea_id, int xsize, int ysize) ModifyGadget(gi, GDI_AREA_SIZE, xsize, ysize, GDI_END); } -static void ModifyEditorElementList() +static void ModifyEditorElementList(void) { int i; @@ -8780,7 +8848,7 @@ static void PickDrawingElement(int button, int element) redraw_mask |= REDRAW_DOOR_1; } -static void RedrawDrawingElements() +static void RedrawDrawingElements(void) { PickDrawingElement(1, new_element1); PickDrawingElement(2, new_element2); @@ -8812,17 +8880,12 @@ static void DrawDrawingWindowExt(boolean remap_toolbox_gadgets) } } -static void DrawDrawingWindow() +static void DrawDrawingWindow(void) { DrawDrawingWindowExt(TRUE); } -static void DrawDrawingWindow_PlayfieldOnly() -{ - DrawDrawingWindowExt(FALSE); -} - -static int getTabulatorBarWidth() +static int getTabulatorBarWidth(void) { struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO]; struct GadgetInfo *gd_gi4 = level_editor_gadget[GADGET_ID_PROPERTIES_CHANGE]; @@ -8830,12 +8893,12 @@ static int getTabulatorBarWidth() return gd_gi4->x - gd_gi1->x + gd_gi4->width; } -static int getTabulatorBarHeight() +static int getTabulatorBarHeight(void) { return ED_TAB_BAR_HEIGHT; } -static Pixel getTabulatorBarColor() +static Pixel getTabulatorBarColor(void) { struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL]; struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED]; @@ -8845,7 +8908,7 @@ static Pixel getTabulatorBarColor() return GetPixel(gd->bitmap, gd_x, gd_y); } -static void DrawLevelInfoTabulatorGadgets() +static void DrawLevelInfoTabulatorGadgets(void) { struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL]; Pixel tab_color = getTabulatorBarColor(); @@ -8878,7 +8941,7 @@ static void DrawLevelInfoTabulatorGadgets() getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); } -static void DrawPropertiesTabulatorGadgets() +static void DrawPropertiesTabulatorGadgets(void) { struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO]; struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED]; @@ -8946,7 +9009,7 @@ static int PrintElementDescriptionFromFile(char *filename, int font_nr, TRUE, FALSE, FALSE); } -static void DrawLevelInfoLevel() +static void DrawLevelInfoLevel(void) { int i; @@ -8975,7 +9038,7 @@ static char *getLevelSubdirFromSaveMode(int save_mode) return leveldir_current->subdir; } -static void DrawLevelInfoLevelSet_DirectoryInfo() +static void DrawLevelInfoLevelSet_DirectoryInfo(void) { char *directory_text = "Level set directory:"; char *directory_name = getLevelSubdirFromSaveMode(levelset_save_mode); @@ -8990,14 +9053,27 @@ static void DrawLevelInfoLevelSet_DirectoryInfo() PrintInfoText(directory_name, font2_nr, x, y); } -static void DrawLevelInfoLevelSet() +static void DrawLevelInfoLevelSet(void) { + boolean artwork_exists = checkIfCustomArtworkExistsForCurrentLevelSet(); + boolean template_exists = fileExists(getLocalLevelTemplateFilename()); int i; /* draw counter gadgets */ for (i = ED_COUNTER_ID_LEVELSET_FIRST; i <= ED_COUNTER_ID_LEVELSET_LAST; i++) MapCounterButtons(i); + /* draw checkbutton gadgets */ + for (i = ED_CHECKBUTTON_ID_LEVELSET_FIRST; i <= ED_CHECKBUTTON_ID_LEVELSET_LAST; i++) + { + if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE || + (i == ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK && !artwork_exists) || + (i == ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE && !template_exists)) + continue; + + MapCheckbuttonGadget(i); + } + /* draw selectbox gadgets */ for (i = ED_SELECTBOX_ID_LEVELSET_FIRST; i <= ED_SELECTBOX_ID_LEVELSET_LAST; i++) MapSelectboxGadget(i); @@ -9013,7 +9089,7 @@ static void DrawLevelInfoLevelSet() DrawLevelInfoLevelSet_DirectoryInfo(); } -static void DrawLevelInfoEditor() +static void DrawLevelInfoEditor(void) { int i; @@ -9036,7 +9112,7 @@ static void DrawLevelInfoEditor() MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2); } -static void DrawLevelInfoWindow() +static void DrawLevelInfoWindow(void) { char *text = "Global Settings"; int font_nr = FONT_TITLE_1; @@ -9065,7 +9141,7 @@ static void DrawLevelInfoWindow() DrawLevelInfoEditor(); } -static void DrawCustomContentArea() +static void DrawCustomContentArea(void) { int id = ED_DRAWING_ID_CUSTOM_CONTENT; struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; @@ -9082,7 +9158,7 @@ static void DrawCustomContentArea() MapDrawingArea(ED_DRAWING_ID_CUSTOM_CONTENT); } -static void DrawCustomChangeContentArea() +static void DrawCustomChangeContentArea(void) { int id = ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT; struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; @@ -9107,7 +9183,7 @@ static void RemoveElementContentArea(int id, int font_height) ED_GADGET_TEXT_DISTANCE + font_height); } -static void DrawYamYamContentAreas() +static void DrawYamYamContentAreas(void) { int font_nr = FONT_TEXT_1; int font_height = getFontHeight(font_nr); @@ -9142,7 +9218,7 @@ static void DrawYamYamContentAreas() DrawText(x, y + 2 * tilesize, "smashed", font_nr); } -static void DrawMagicBallContentAreas() +static void DrawMagicBallContentAreas(void) { int font_nr = FONT_TEXT_1; int font_height = getFontHeight(font_nr); @@ -9281,7 +9357,7 @@ static void DrawEnvelopeTextArea(int envelope_nr) MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO); } -static void DrawPropertiesInfo() +static void DrawPropertiesInfo(void) { static struct { @@ -9604,7 +9680,7 @@ static boolean checkPropertiesConfig(int element) return FALSE; } -static void SetAutomaticNumberOfGemsNeeded() +static void SetAutomaticNumberOfGemsNeeded(void) { int x, y; @@ -9629,7 +9705,7 @@ static void SetAutomaticNumberOfGemsNeeded() ModifyEditorCounterValue(ED_COUNTER_ID_LEVEL_GEMSLIMIT, level.gems_needed); } -static void DrawPropertiesConfig() +static void DrawPropertiesConfig(void) { boolean draw_footer_line = FALSE; int max_num_element_counters = 4; @@ -9752,6 +9828,7 @@ static void DrawPropertiesConfig() MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_GRAVITY); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER); MapDrawingArea(ED_DRAWING_ID_START_ELEMENT); MapDrawingArea(ED_DRAWING_ID_ARTWORK_ELEMENT); @@ -9971,7 +10048,7 @@ static void DrawPropertiesConfig() } } -static void DrawPropertiesChangeDrawingAreas() +static void DrawPropertiesChangeDrawingAreas(void) { if (IS_CUSTOM_ELEMENT(properties_element)) { @@ -9985,7 +10062,7 @@ static void DrawPropertiesChangeDrawingAreas() redraw_mask |= REDRAW_FIELD; } -static void DrawPropertiesChange() +static void DrawPropertiesChange(void) { int i; @@ -10079,7 +10156,7 @@ static void DrawEditorElementName(int x, int y, int font_nr) } } -static void DrawPropertiesWindow() +static void DrawPropertiesWindow(void) { struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT]; int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size; @@ -10148,7 +10225,7 @@ static void DrawPropertiesWindow() DrawPropertiesConfig(); } -static void DrawPaletteWindow() +static void DrawPaletteWindow(void) { int i; @@ -10165,7 +10242,7 @@ static void DrawPaletteWindow() MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]); } -static void UpdateCustomElementGraphicGadgets() +static void UpdateCustomElementGraphicGadgets(void) { int i; @@ -11146,10 +11223,10 @@ static void SetElementIntelliDraw(int x, int y, int new_element, EL_MM_WOODEN_GRID_FIXED_3 }, { - EL_MM_POLARISATOR_CROSS_1, - EL_MM_POLARISATOR_CROSS_4, - EL_MM_POLARISATOR_CROSS_3, - EL_MM_POLARISATOR_CROSS_2 + EL_MM_POLARIZER_CROSS_1, + EL_MM_POLARIZER_CROSS_4, + EL_MM_POLARIZER_CROSS_3, + EL_MM_POLARIZER_CROSS_2 }, { EL_MM_PACMAN_UP, @@ -11242,112 +11319,112 @@ static void SetElementIntelliDraw(int x, int y, int new_element, EL_MM_MIRROR_2 }, { - EL_MM_BEAMER_5, - EL_MM_BEAMER_4, - EL_MM_BEAMER_3, - EL_MM_BEAMER_2, - EL_MM_BEAMER_1, - EL_MM_BEAMER_16, - EL_MM_BEAMER_15, - EL_MM_BEAMER_14, - EL_MM_BEAMER_13, - EL_MM_BEAMER_12, - EL_MM_BEAMER_11, - EL_MM_BEAMER_10, - EL_MM_BEAMER_9, - EL_MM_BEAMER_8, - EL_MM_BEAMER_7, - EL_MM_BEAMER_6 + EL_MM_TELEPORTER_5, + EL_MM_TELEPORTER_4, + EL_MM_TELEPORTER_3, + EL_MM_TELEPORTER_2, + EL_MM_TELEPORTER_1, + EL_MM_TELEPORTER_16, + EL_MM_TELEPORTER_15, + EL_MM_TELEPORTER_14, + EL_MM_TELEPORTER_13, + EL_MM_TELEPORTER_12, + EL_MM_TELEPORTER_11, + EL_MM_TELEPORTER_10, + EL_MM_TELEPORTER_9, + EL_MM_TELEPORTER_8, + EL_MM_TELEPORTER_7, + EL_MM_TELEPORTER_6 }, { - EL_MM_BEAMER_RED_5, - EL_MM_BEAMER_RED_4, - EL_MM_BEAMER_RED_3, - EL_MM_BEAMER_RED_2, - EL_MM_BEAMER_RED_1, - EL_MM_BEAMER_RED_16, - EL_MM_BEAMER_RED_15, - EL_MM_BEAMER_RED_14, - EL_MM_BEAMER_RED_13, - EL_MM_BEAMER_RED_12, - EL_MM_BEAMER_RED_11, - EL_MM_BEAMER_RED_10, - EL_MM_BEAMER_RED_9, - EL_MM_BEAMER_RED_8, - EL_MM_BEAMER_RED_7, - EL_MM_BEAMER_RED_6 + EL_MM_TELEPORTER_RED_5, + EL_MM_TELEPORTER_RED_4, + EL_MM_TELEPORTER_RED_3, + EL_MM_TELEPORTER_RED_2, + EL_MM_TELEPORTER_RED_1, + EL_MM_TELEPORTER_RED_16, + EL_MM_TELEPORTER_RED_15, + EL_MM_TELEPORTER_RED_14, + EL_MM_TELEPORTER_RED_13, + EL_MM_TELEPORTER_RED_12, + EL_MM_TELEPORTER_RED_11, + EL_MM_TELEPORTER_RED_10, + EL_MM_TELEPORTER_RED_9, + EL_MM_TELEPORTER_RED_8, + EL_MM_TELEPORTER_RED_7, + EL_MM_TELEPORTER_RED_6 }, { - EL_MM_BEAMER_YELLOW_5, - EL_MM_BEAMER_YELLOW_4, - EL_MM_BEAMER_YELLOW_3, - EL_MM_BEAMER_YELLOW_2, - EL_MM_BEAMER_YELLOW_1, - EL_MM_BEAMER_YELLOW_16, - EL_MM_BEAMER_YELLOW_15, - EL_MM_BEAMER_YELLOW_14, - EL_MM_BEAMER_YELLOW_13, - EL_MM_BEAMER_YELLOW_12, - EL_MM_BEAMER_YELLOW_11, - EL_MM_BEAMER_YELLOW_10, - EL_MM_BEAMER_YELLOW_9, - EL_MM_BEAMER_YELLOW_8, - EL_MM_BEAMER_YELLOW_7, - EL_MM_BEAMER_YELLOW_6 + EL_MM_TELEPORTER_YELLOW_5, + EL_MM_TELEPORTER_YELLOW_4, + EL_MM_TELEPORTER_YELLOW_3, + EL_MM_TELEPORTER_YELLOW_2, + EL_MM_TELEPORTER_YELLOW_1, + EL_MM_TELEPORTER_YELLOW_16, + EL_MM_TELEPORTER_YELLOW_15, + EL_MM_TELEPORTER_YELLOW_14, + EL_MM_TELEPORTER_YELLOW_13, + EL_MM_TELEPORTER_YELLOW_12, + EL_MM_TELEPORTER_YELLOW_11, + EL_MM_TELEPORTER_YELLOW_10, + EL_MM_TELEPORTER_YELLOW_9, + EL_MM_TELEPORTER_YELLOW_8, + EL_MM_TELEPORTER_YELLOW_7, + EL_MM_TELEPORTER_YELLOW_6 }, { - EL_MM_BEAMER_GREEN_5, - EL_MM_BEAMER_GREEN_4, - EL_MM_BEAMER_GREEN_3, - EL_MM_BEAMER_GREEN_2, - EL_MM_BEAMER_GREEN_1, - EL_MM_BEAMER_GREEN_16, - EL_MM_BEAMER_GREEN_15, - EL_MM_BEAMER_GREEN_14, - EL_MM_BEAMER_GREEN_13, - EL_MM_BEAMER_GREEN_12, - EL_MM_BEAMER_GREEN_11, - EL_MM_BEAMER_GREEN_10, - EL_MM_BEAMER_GREEN_9, - EL_MM_BEAMER_GREEN_8, - EL_MM_BEAMER_GREEN_7, - EL_MM_BEAMER_GREEN_6 + EL_MM_TELEPORTER_GREEN_5, + EL_MM_TELEPORTER_GREEN_4, + EL_MM_TELEPORTER_GREEN_3, + EL_MM_TELEPORTER_GREEN_2, + EL_MM_TELEPORTER_GREEN_1, + EL_MM_TELEPORTER_GREEN_16, + EL_MM_TELEPORTER_GREEN_15, + EL_MM_TELEPORTER_GREEN_14, + EL_MM_TELEPORTER_GREEN_13, + EL_MM_TELEPORTER_GREEN_12, + EL_MM_TELEPORTER_GREEN_11, + EL_MM_TELEPORTER_GREEN_10, + EL_MM_TELEPORTER_GREEN_9, + EL_MM_TELEPORTER_GREEN_8, + EL_MM_TELEPORTER_GREEN_7, + EL_MM_TELEPORTER_GREEN_6 }, { - EL_MM_BEAMER_BLUE_5, - EL_MM_BEAMER_BLUE_4, - EL_MM_BEAMER_BLUE_3, - EL_MM_BEAMER_BLUE_2, - EL_MM_BEAMER_BLUE_1, - EL_MM_BEAMER_BLUE_16, - EL_MM_BEAMER_BLUE_15, - EL_MM_BEAMER_BLUE_14, - EL_MM_BEAMER_BLUE_13, - EL_MM_BEAMER_BLUE_12, - EL_MM_BEAMER_BLUE_11, - EL_MM_BEAMER_BLUE_10, - EL_MM_BEAMER_BLUE_9, - EL_MM_BEAMER_BLUE_8, - EL_MM_BEAMER_BLUE_7, - EL_MM_BEAMER_BLUE_6 + EL_MM_TELEPORTER_BLUE_5, + EL_MM_TELEPORTER_BLUE_4, + EL_MM_TELEPORTER_BLUE_3, + EL_MM_TELEPORTER_BLUE_2, + EL_MM_TELEPORTER_BLUE_1, + EL_MM_TELEPORTER_BLUE_16, + EL_MM_TELEPORTER_BLUE_15, + EL_MM_TELEPORTER_BLUE_14, + EL_MM_TELEPORTER_BLUE_13, + EL_MM_TELEPORTER_BLUE_12, + EL_MM_TELEPORTER_BLUE_11, + EL_MM_TELEPORTER_BLUE_10, + EL_MM_TELEPORTER_BLUE_9, + EL_MM_TELEPORTER_BLUE_8, + EL_MM_TELEPORTER_BLUE_7, + EL_MM_TELEPORTER_BLUE_6 }, { - EL_MM_POLARISATOR_1, - EL_MM_POLARISATOR_16, - EL_MM_POLARISATOR_15, - EL_MM_POLARISATOR_14, - EL_MM_POLARISATOR_13, - EL_MM_POLARISATOR_12, - EL_MM_POLARISATOR_11, - EL_MM_POLARISATOR_10, - EL_MM_POLARISATOR_9, - EL_MM_POLARISATOR_8, - EL_MM_POLARISATOR_7, - EL_MM_POLARISATOR_6, - EL_MM_POLARISATOR_5, - EL_MM_POLARISATOR_4, - EL_MM_POLARISATOR_3, - EL_MM_POLARISATOR_2 + EL_MM_POLARIZER_1, + EL_MM_POLARIZER_16, + EL_MM_POLARIZER_15, + EL_MM_POLARIZER_14, + EL_MM_POLARIZER_13, + EL_MM_POLARIZER_12, + EL_MM_POLARIZER_11, + EL_MM_POLARIZER_10, + EL_MM_POLARIZER_9, + EL_MM_POLARIZER_8, + EL_MM_POLARIZER_7, + EL_MM_POLARIZER_6, + EL_MM_POLARIZER_5, + EL_MM_POLARIZER_4, + EL_MM_POLARIZER_3, + EL_MM_POLARIZER_2 }, { EL_DF_MIRROR_1, @@ -11464,7 +11541,7 @@ static void SetElementIntelliDraw(int x, int y, int new_element, last_y = y; } -static void ResetIntelliDraw() +static void ResetIntelliDraw(void) { int x, y; @@ -11484,7 +11561,7 @@ static void SetDrawModeHiRes(int element) (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY)); } -static boolean getDrawModeHiRes() +static boolean getDrawModeHiRes(void) { return draw_mode_hires; } @@ -11921,17 +11998,17 @@ static void CopyBrushToCursor(int x, int y) CopyBrushExt(x, y, 0, 0, 0, CB_BRUSH_TO_CURSOR); } -static void DeleteBrushFromCursor() +static void DeleteBrushFromCursor(void) { CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR); } -void DumpBrush() +void DumpBrush(void) { CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH); } -void DumpBrush_Small() +void DumpBrush_Small(void) { CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH_SMALL); } @@ -12226,6 +12303,18 @@ void WrapLevel(int dx, int dy) CopyLevelToUndoBuffer(UNDO_ACCUMULATE); } +static void CopyLevelTemplateToUserLevelSet(char *levelset_subdir) +{ + char *template_filename_old = getLocalLevelTemplateFilename(); + char *template_filename_new = + getPath2(getUserLevelDir(levelset_subdir), LEVELTEMPLATE_FILENAME); + + if (copyFile(template_filename_old, template_filename_new) != 0) + Request("Cannot copy level template!", REQ_CONFIRM); + + free(template_filename_new); +} + static void HandleDrawingAreas(struct GadgetInfo *gi) { static boolean started_inside_drawing_area = FALSE; @@ -12830,13 +12919,21 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi) Request("Updating level set failed!", REQ_CONFIRM); } } - else + else if (levelset_save_mode == LEVELSET_SAVE_MODE_CREATE) { + if (level.changed && !Request("Level has changed! Discard changes?", + REQ_ASK)) + return; + if (CreateUserLevelSet(levelset_subdir, levelset_name, levelset_author, - levelset_num_levels)) + levelset_num_levels, + levelset_use_levelset_artwork)) { + if (levelset_copy_level_template) + CopyLevelTemplateToUserLevelSet(levelset_subdir); + Request("New level set created!", REQ_CONFIRM); AddUserLevelSetToLevelInfo(levelset_subdir); @@ -13057,8 +13154,11 @@ static void HandleCheckbuttons(struct GadgetInfo *gi) } /* do not mark level as modified for certain non-level-changing gadgets */ - if ((type_id >= ED_CHECKBUTTON_ID_EDITOR_FIRST && - type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST) || + if ((type_id >= ED_CHECKBUTTON_ID_LEVELSET_FIRST && + type_id <= ED_CHECKBUTTON_ID_LEVELSET_LAST) || + (type_id >= ED_CHECKBUTTON_ID_EDITOR_FIRST && + type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST && + type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2) || type_id == ED_CHECKBUTTON_ID_STICK_ELEMENT) return; @@ -13753,7 +13853,7 @@ void HandleLevelEditorKeyInput(Key key) } } -void HandleLevelEditorIdle() +void HandleLevelEditorIdle(void) { int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size; int x = editor.settings.element_graphic.x + element_border; @@ -13783,7 +13883,7 @@ void HandleLevelEditorIdle() FrameCounter++; /* increase animation frame counter */ } -static void ClearEditorGadgetInfoText() +static void ClearEditorGadgetInfoText(void) { DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE); }