X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=1e45e10641304a26a353278d04b6aea85f7d1dd9;hb=ad15815ec04f42779d0717a6d291f93b8e847d39;hp=da21b2dd0003cfc54db4d6f0c2feba3cd528f3a5;hpb=e77dd3ec50667c0c0bf1683a0fed15498c256010;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index da21b2dd..1e45e106 100644 --- a/src/editor.c +++ b/src/editor.c @@ -20,9 +20,13 @@ #include "tools.h" #include "files.h" #include "game.h" +#include "init.h" #include "tape.h" +#define INFOTEXT_UNKNOWN_ELEMENT "unknown" + + /* ----------------------------------------------------------------------------- screen and artwork graphic pixel position definitions @@ -67,12 +71,24 @@ #define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \ ED_ELEMENTLIST_BUTTONS_VERT) +/* standard distances */ +#define ED_BORDER_SIZE 3 +#define ED_BORDER_TEXT_XSIZE 5 +#define ED_BORDER_AREA_YSIZE 1 + +#define ED_GADGET_DISTANCE 2 +#define ED_GADGET_TEXT_DISTANCE (2 * ED_GADGET_DISTANCE) +#define ED_DRAWINGAREA_TEXT_DISTANCE (ED_GADGET_TEXT_DISTANCE + \ + MINI_TILEX / 2) + /* values for the setting windows */ #define ED_SETTINGS_XSTART (3 * MINI_TILEX / 2) #define ED_SETTINGS_YSTART (MINI_TILEY * 10) -#define ED_SETTINGS_XOFFSET (ED_CHECKBUTTON_XSIZE + \ +#define ED_XOFFSET_CHECKBOX (ED_CHECKBUTTON_XSIZE + \ 2 * ED_GADGET_DISTANCE) + +#define ED_SETTINGS_XOFFSET ED_XOFFSET_CHECKBOX #define ED_SETTINGS_YOFFSET (3 * MINI_TILEY / 2) #define ED_SETTINGS_XPOS(n) (ED_SETTINGS_XSTART + \ @@ -85,13 +101,6 @@ #define ED_SETTINGS2_YPOS (ED_SETTINGS1_YPOS + 12 * TILEY - 2) /* values for counter gadgets */ -#define ED_COUNT_ELEMENT_SCORE_XPOS ED_SETTINGS_XPOS(0) -#define ED_COUNT_ELEMENT_SCORE_YPOS ED_SETTINGS_YPOS(0) -#define ED_COUNT_ELEMENT_CONTENT_XPOS ED_SETTINGS_XPOS(0) -#define ED_COUNT_ELEMENT_CONTENT_YPOS ED_SETTINGS_YPOS(6) - -#define ED_COUNT_CHANGE_DELAY_XPOS (ED_SETTINGS_XPOS(1) + 9 * MINI_TILEX) - #define ED_COUNTER_YSTART (ED_SETTINGS1_YPOS + 2 * TILEY) #define ED_COUNTER_YDISTANCE (3 * MINI_TILEY) #define ED_COUNTER_YPOS(n) (ED_COUNTER_YSTART + \ @@ -99,25 +108,36 @@ #define ED_COUNTER2_YPOS(n) (ED_COUNTER_YSTART + \ n * ED_COUNTER_YDISTANCE - 2) -/* standard distances */ -#define ED_BORDER_SIZE 3 -#define ED_BORDER2_SIZE 5 -#define ED_GADGET_DISTANCE 2 - /* values for element content drawing areas */ +/* amoeba content */ #define ED_AREA_ELEM_CONTENT_XPOS ( 2 * MINI_TILEX) #define ED_AREA_ELEM_CONTENT_YPOS (22 * MINI_TILEY) -#define ED_AREA_ELEM_CONTENT2_XPOS (20 * MINI_TILEX) -#define ED_AREA_ELEM_CONTENT2_YPOS (ED_SETTINGS_YPOS(1) + \ - ED_GADGET_DISTANCE) +/* yamyam content */ +#define ED_AREA_YAMYAM_CONTENT_XPOS(n) (ED_AREA_ELEM_CONTENT_XPOS + \ + 5 * (n % 4) * MINI_TILEX) +#define ED_AREA_YAMYAM_CONTENT_YPOS(n) (ED_AREA_ELEM_CONTENT_YPOS + \ + 6 * (n / 4) * MINI_TILEY) -#define ED_AREA_ELEM_CONTENT3_XPOS (24 * MINI_TILEX) -#define ED_AREA_ELEM_CONTENT3_YPOS (ED_SETTINGS_YPOS(2) + \ +/* custom change target */ +#define ED_AREA_ELEM_CONTENT2_YPOS (ED_SETTINGS_YPOS(2) + \ + ED_GADGET_DISTANCE) +/* optional custom graphic */ +#define ED_AREA_ELEM_CONTENT3_YPOS (ED_SETTINGS_YPOS(1) + \ ED_GADGET_DISTANCE) +/* custom element content */ +#define ED_AREA_ELEM_CONTENT4_XPOS (29 * MINI_TILEX) +#define ED_AREA_ELEM_CONTENT4_YPOS (ED_SETTINGS_YPOS(12) + \ + ED_GADGET_DISTANCE - MINI_TILEY) +/* custom change trigger element */ +#define ED_AREA_ELEM_CONTENT5_YPOS (ED_SETTINGS_YPOS(6) + \ + 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(10) + \ + ED_GADGET_DISTANCE - MINI_TILEY) /* values for random placement background drawing area */ -#define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX) #define ED_AREA_RANDOM_BACKGROUND_YPOS (31 * MINI_TILEY) /* values for scrolling gadgets for drawing area */ @@ -214,11 +234,19 @@ #define ED_SELECTBOX_XSIZE ED_WIN_COUNT_XSIZE #define ED_SELECTBOX_YSIZE ED_WIN_COUNT_YSIZE +#define ED_SELECTBOX_BUTTON_XSIZE 14 + #define ED_TEXTBUTTON_XPOS ED_WIN_COUNT_XPOS #define ED_TEXTBUTTON_YPOS (ED_WIN_COUNT_YPOS + \ + 4 * (2 + ED_WIN_COUNT_YSIZE)) +#define ED_TEXTBUTTON_INACTIVE_YPOS ED_TEXTBUTTON_YPOS + +#define ED_TEXTBUTTON_TAB_XPOS ED_WIN_COUNT_XPOS +#define ED_TEXTBUTTON_TAB_YPOS (ED_WIN_COUNT_YPOS + \ 2 * (2 + ED_WIN_COUNT_YSIZE)) -#define ED_TEXTBUTTON_INACTIVE_YPOS (ED_WIN_COUNT_YPOS + \ +#define ED_TEXTBUTTON_TAB_INACTIVE_YPOS (ED_WIN_COUNT_YPOS + \ 3 * (2 + ED_WIN_COUNT_YSIZE)) + #define ED_TEXTBUTTON_XSIZE ED_WIN_COUNT_XSIZE #define ED_TEXTBUTTON_YSIZE ED_WIN_COUNT_YSIZE @@ -277,9 +305,9 @@ #define GADGET_ID_LEVEL_RANDOM_DOWN (GADGET_ID_COUNTER_FIRST + 9) #define GADGET_ID_LEVEL_RANDOM_TEXT (GADGET_ID_COUNTER_FIRST + 10) #define GADGET_ID_LEVEL_RANDOM_UP (GADGET_ID_COUNTER_FIRST + 11) -#define GADGET_ID_LEVEL_COLLECT_DOWN (GADGET_ID_COUNTER_FIRST + 12) -#define GADGET_ID_LEVEL_COLLECT_TEXT (GADGET_ID_COUNTER_FIRST + 13) -#define GADGET_ID_LEVEL_COLLECT_UP (GADGET_ID_COUNTER_FIRST + 14) +#define GADGET_ID_LEVEL_GEMSLIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 12) +#define GADGET_ID_LEVEL_GEMSLIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 13) +#define GADGET_ID_LEVEL_GEMSLIMIT_UP (GADGET_ID_COUNTER_FIRST + 14) #define GADGET_ID_LEVEL_TIMELIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 15) #define GADGET_ID_LEVEL_TIMELIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 16) #define GADGET_ID_LEVEL_TIMELIMIT_UP (GADGET_ID_COUNTER_FIRST + 17) @@ -292,15 +320,42 @@ #define GADGET_ID_ELEMENT_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 24) #define GADGET_ID_ELEMENT_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 25) #define GADGET_ID_ELEMENT_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 26) -#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 27) -#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 28) -#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 29) -#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 30) -#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 31) -#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 32) +#define GADGET_ID_ENVELOPE_XSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 27) +#define GADGET_ID_ENVELOPE_XSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 28) +#define GADGET_ID_ENVELOPE_XSIZE_UP (GADGET_ID_COUNTER_FIRST + 29) +#define GADGET_ID_ENVELOPE_YSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 30) +#define GADGET_ID_ENVELOPE_YSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 31) +#define GADGET_ID_ENVELOPE_YSIZE_UP (GADGET_ID_COUNTER_FIRST + 32) +#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 33) +#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 34) +#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 35) +#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 36) +#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 37) +#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 38) +#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 39) +#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 40) +#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 41) +#define GADGET_ID_PUSH_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 42) +#define GADGET_ID_PUSH_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 43) +#define GADGET_ID_PUSH_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 44) +#define GADGET_ID_MOVE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 45) +#define GADGET_ID_MOVE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 46) +#define GADGET_ID_MOVE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 47) +#define GADGET_ID_MOVE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 48) +#define GADGET_ID_MOVE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 49) +#define GADGET_ID_MOVE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 50) +#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 51) +#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 52) +#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 53) +#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 54) +#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 55) +#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 56) +#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 57) +#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 58) +#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 59) /* drawing area identifiers */ -#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 33) +#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 60) #define GADGET_ID_DRAWING_LEVEL (GADGET_ID_DRAWING_AREA_FIRST + 0) #define GADGET_ID_ELEMENT_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 1) @@ -313,32 +368,62 @@ #define GADGET_ID_ELEMENT_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 8) #define GADGET_ID_AMOEBA_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 9) #define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 10) -#define GADGET_ID_CUSTOM_CHANGED (GADGET_ID_DRAWING_AREA_FIRST + 11) -#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 12) +#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 11) +#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 12) +#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 13) +#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 14) +#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 15) /* text input identifiers */ -#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 13) +#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 16) #define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0) #define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1) +#define GADGET_ID_ELEMENT_NAME (GADGET_ID_TEXT_INPUT_FIRST + 2) + +/* text area identifiers */ +#define GADGET_ID_TEXT_AREA_FIRST (GADGET_ID_TEXT_INPUT_FIRST + 3) + +#define GADGET_ID_ENVELOPE_INFO (GADGET_ID_TEXT_AREA_FIRST + 0) /* selectbox identifiers */ -#define GADGET_ID_SELECTBOX_FIRST (GADGET_ID_TEXT_INPUT_FIRST + 2) +#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_WALKABLE_LAYER (GADGET_ID_SELECTBOX_FIRST + 1) -#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 2) -#define GADGET_ID_CHANGE_CAUSE (GADGET_ID_SELECTBOX_FIRST + 3) +#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_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 6) +#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 7) +#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 8) +#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 9) +#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 10) +#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 11) +#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 12) +#define GADGET_ID_CHANGE_SIDES (GADGET_ID_SELECTBOX_FIRST + 13) +#define GADGET_ID_CHANGE_POWER (GADGET_ID_SELECTBOX_FIRST + 14) +#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 15) /* textbutton identifiers */ -#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 4) +#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 16) #define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0) #define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1) #define GADGET_ID_PROPERTIES_ADVANCED (GADGET_ID_TEXTBUTTON_FIRST + 2) +#define GADGET_ID_SAVE_AS_TEMPLATE (GADGET_ID_TEXTBUTTON_FIRST + 3) +#define GADGET_ID_ADD_CHANGE_PAGE (GADGET_ID_TEXTBUTTON_FIRST + 4) +#define GADGET_ID_DEL_CHANGE_PAGE (GADGET_ID_TEXTBUTTON_FIRST + 5) + +/* graphicbutton identifiers */ +#define GADGET_ID_GRAPHICBUTTON_FIRST (GADGET_ID_TEXTBUTTON_FIRST + 6) + +#define GADGET_ID_PREV_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 0) +#define GADGET_ID_NEXT_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 1) /* gadgets for scrolling of drawing area */ -#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_TEXTBUTTON_FIRST + 3) +#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_GRAPHICBUTTON_FIRST + 2) #define GADGET_ID_SCROLL_UP (GADGET_ID_SCROLLING_FIRST + 0) #define GADGET_ID_SCROLL_DOWN (GADGET_ID_SCROLLING_FIRST + 1) @@ -354,7 +439,7 @@ #define GADGET_ID_SCROLL_LIST_DOWN (GADGET_ID_SCROLLING_LIST_FIRST + 1) #define GADGET_ID_SCROLL_LIST_VERTICAL (GADGET_ID_SCROLLING_LIST_FIRST + 2) -/* buttons for level/element properties */ +/* checkbuttons for level/element properties */ #define GADGET_ID_CHECKBUTTON_FIRST (GADGET_ID_SCROLLING_LIST_FIRST + 3) #define GADGET_ID_RANDOM_PERCENTAGE (GADGET_ID_CHECKBUTTON_FIRST + 0) @@ -364,20 +449,30 @@ #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_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 7) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 8) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 12) -#define GADGET_ID_CUSTOM_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 13) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 14) -#define GADGET_ID_CUSTOM_CHANGEABLE (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_CHANGE_DELAY_FIXED (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CHANGE_DELAY_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CUSTOM_EXPLODE_RESULT (GADGET_ID_CHECKBUTTON_FIRST + 7) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 8) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 9) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 10) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 27) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 28) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -392,22 +487,34 @@ #define ED_COUNTER_ID_SELECT_LEVEL 0 #define ED_COUNTER_ID_LEVEL_XSIZE 1 #define ED_COUNTER_ID_LEVEL_YSIZE 2 -#define ED_COUNTER_ID_LEVEL_COLLECT 3 +#define ED_COUNTER_ID_LEVEL_GEMSLIMIT 3 #define ED_COUNTER_ID_LEVEL_TIMELIMIT 4 #define ED_COUNTER_ID_LEVEL_TIMESCORE 5 #define ED_COUNTER_ID_LEVEL_RANDOM 6 #define ED_COUNTER_ID_ELEMENT_SCORE 7 #define ED_COUNTER_ID_ELEMENT_CONTENT 8 -#define ED_COUNTER_ID_CHANGE_DELAY_FIX 9 -#define ED_COUNTER_ID_CHANGE_DELAY_RND 10 - -#define ED_NUM_COUNTERBUTTONS 11 +#define ED_COUNTER_ID_ENVELOPE_XSIZE 9 +#define ED_COUNTER_ID_ENVELOPE_YSIZE 10 +#define ED_COUNTER_ID_CUSTOM_SCORE 11 +#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 12 +#define ED_COUNTER_ID_PUSH_DELAY_FIX 13 +#define ED_COUNTER_ID_PUSH_DELAY_RND 14 +#define ED_COUNTER_ID_MOVE_DELAY_FIX 15 +#define ED_COUNTER_ID_MOVE_DELAY_RND 16 +#define ED_COUNTER_ID_CHANGE_DELAY_FIX 17 +#define ED_COUNTER_ID_CHANGE_DELAY_RND 18 +#define ED_COUNTER_ID_CHANGE_CONT_RND 19 + +#define ED_NUM_COUNTERBUTTONS 20 #define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE #define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM +#define ED_COUNTER_ID_CUSTOM_FIRST ED_COUNTER_ID_CUSTOM_SCORE +#define ED_COUNTER_ID_CUSTOM_LAST ED_COUNTER_ID_MOVE_DELAY_RND + #define ED_COUNTER_ID_CHANGE_FIRST ED_COUNTER_ID_CHANGE_DELAY_FIX -#define ED_COUNTER_ID_CHANGE_LAST ED_COUNTER_ID_CHANGE_DELAY_RND +#define ED_COUNTER_ID_CHANGE_LAST ED_COUNTER_ID_CHANGE_CONT_RND /* values for scrollbutton gadgets */ #define ED_SCROLLBUTTON_ID_AREA_UP 0 @@ -435,32 +542,71 @@ /* values for text input gadgets */ #define ED_TEXTINPUT_ID_LEVEL_NAME 0 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR 1 +#define ED_TEXTINPUT_ID_ELEMENT_NAME 2 -#define ED_NUM_TEXTINPUT 2 +#define ED_NUM_TEXTINPUT 3 #define ED_TEXTINPUT_ID_LEVEL_FIRST ED_TEXTINPUT_ID_LEVEL_NAME #define ED_TEXTINPUT_ID_LEVEL_LAST ED_TEXTINPUT_ID_LEVEL_AUTHOR -/* values for selectbox gadgets */ -#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_OBJECT 0 -#define ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER 1 -#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 2 -#define ED_SELECTBOX_ID_CHANGE_CAUSE 3 +/* values for text area gadgets */ +#define ED_TEXTAREA_ID_ENVELOPE_INFO 0 + +#define ED_NUM_TEXTAREAS 1 -#define ED_NUM_SELECTBOX 4 +#define ED_TEXTAREA_ID_LEVEL_FIRST ED_TEXTAREA_ID_ENVELOPE +#define ED_TEXTAREA_ID_LEVEL_LAST ED_TEXTAREA_ID_ENVELOPE -#define ED_SELECTBOX_ID_CUSTOM_FIRST ED_SELECTBOX_ID_CUSTOM_WALK_TO_OBJECT -#define ED_SELECTBOX_ID_CUSTOM_LAST ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER +/* 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_WALK_TO_ACTION 2 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 3 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 4 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 5 +#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 6 +#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 7 +#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 8 +#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY 9 +#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 10 +#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 11 +#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 12 +#define ED_SELECTBOX_ID_CHANGE_SIDES 13 +#define ED_SELECTBOX_ID_CHANGE_POWER 14 +#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 15 + +#define ED_NUM_SELECTBOX 16 + +#define ED_SELECTBOX_ID_CUSTOM_FIRST ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE +#define ED_SELECTBOX_ID_CUSTOM_LAST ED_SELECTBOX_ID_CUSTOM_CONSISTENCY #define ED_SELECTBOX_ID_CHANGE_FIRST ED_SELECTBOX_ID_CHANGE_TIME_UNITS -#define ED_SELECTBOX_ID_CHANGE_LAST ED_SELECTBOX_ID_CHANGE_CAUSE +#define ED_SELECTBOX_ID_CHANGE_LAST ED_SELECTBOX_ID_SELECT_CHANGE_PAGE /* values for textbutton gadgets */ #define ED_TEXTBUTTON_ID_PROPERTIES_INFO 0 #define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG 1 #define ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED 2 +#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE 3 +#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE 4 +#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE 5 + +#define ED_NUM_TEXTBUTTONS 6 + +#define ED_TEXTBUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO +#define ED_TEXTBUTTON_ID_PROPERTIES_LAST ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED + +#define ED_TEXTBUTTON_ID_CHANGE_FIRST ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE +#define ED_TEXTBUTTON_ID_CHANGE_LAST ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE -#define ED_NUM_TEXTBUTTON 3 +/* values for graphicbutton gadgets */ +#define ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE 0 +#define ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE 1 + +#define ED_NUM_GRAPHICBUTTONS 2 + +#define ED_GRAPHICBUTTON_ID_CHANGE_FIRST ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE +#define ED_GRAPHICBUTTON_ID_CHANGE_LAST ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE /* values for checkbutton gadgets */ #define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0 @@ -468,28 +614,38 @@ #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_CUSTOM_INDESTRUCTIBLE 5 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 5 #define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 6 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 7 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 8 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 9 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 7 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 8 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 9 #define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 10 -#define ED_CHECKBUTTON_ID_CUSTOM_WALKABLE 11 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 12 -#define ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE 13 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY_FIXED 14 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY_RANDOM 15 - -#define ED_NUM_CHECKBUTTONS 16 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 11 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT 12 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 13 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 14 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 15 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 16 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 17 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 18 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 19 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 20 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 21 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 22 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 23 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 24 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 25 + +#define ED_NUM_CHECKBUTTONS 26 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED -#define ED_CHECKBUTTON_ID_CUSTOM_FIRST ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE -#define ED_CHECKBUTTON_ID_CUSTOM_LAST ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC +#define ED_CHECKBUTTON_ID_CUSTOM_FIRST ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE +#define ED_CHECKBUTTON_ID_CUSTOM_LAST ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT -#define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE -#define ED_CHECKBUTTON_ID_CHANGE_LAST ED_CHECKBUTTON_ID_CHANGE_DELAY_RANDOM +#define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC +#define ED_CHECKBUTTON_ID_CHANGE_LAST ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE /* values for radiobutton gadgets */ #define ED_RADIOBUTTON_ID_PERCENTAGE 0 @@ -500,6 +656,26 @@ #define ED_RADIOBUTTON_ID_LEVEL_FIRST ED_RADIOBUTTON_ID_PERCENTAGE #define ED_RADIOBUTTON_ID_LEVEL_LAST ED_RADIOBUTTON_ID_QUANTITY +/* values for drawing area gadgets */ +#define ED_DRAWING_ID_DRAWING_LEVEL 0 +#define ED_DRAWING_ID_ELEMENT_CONTENT_0 1 +#define ED_DRAWING_ID_ELEMENT_CONTENT_1 2 +#define ED_DRAWING_ID_ELEMENT_CONTENT_2 3 +#define ED_DRAWING_ID_ELEMENT_CONTENT_3 4 +#define ED_DRAWING_ID_ELEMENT_CONTENT_4 5 +#define ED_DRAWING_ID_ELEMENT_CONTENT_5 6 +#define ED_DRAWING_ID_ELEMENT_CONTENT_6 7 +#define ED_DRAWING_ID_ELEMENT_CONTENT_7 8 +#define ED_DRAWING_ID_AMOEBA_CONTENT 9 +#define ED_DRAWING_ID_CUSTOM_GRAPHIC 10 +#define ED_DRAWING_ID_CUSTOM_CONTENT 11 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 12 +#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 13 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 14 +#define ED_DRAWING_ID_RANDOM_BACKGROUND 15 + +#define ED_NUM_DRAWING_AREAS 16 + /* ----------------------------------------------------------------------------- @@ -531,10 +707,14 @@ /* how many steps can be cancelled */ #define NUM_UNDO_STEPS (10 + 1) -/* values for elements with score */ +/* values for elements with score for certain actions */ #define MIN_SCORE 0 #define MAX_SCORE 255 +/* values for elements with count for collecting */ +#define MIN_COLLECT_COUNT 0 +#define MAX_COLLECT_COUNT 100 + /* values for random placement */ #define RANDOM_USE_PERCENTAGE 0 #define RANDOM_USE_QUANTITY 1 @@ -587,7 +767,8 @@ static boolean random_placement_background_restricted = FALSE; static boolean stick_element_properties_window = FALSE; static boolean custom_element_properties[NUM_ELEMENT_PROPERTIES]; static boolean custom_element_change_events[NUM_CHANGE_EVENTS]; -static struct CustomElementInfo custom_element; +static struct ElementChangeInfo custom_element_change; +static struct ElementInfo custom_element; static struct { @@ -595,98 +776,182 @@ static struct int min_value, max_value; int gadget_id_down, gadget_id_up; int gadget_id_text; + int gadget_id_align; int *value; - char *infotext_above, *infotext_right; + char *text_above, *text_left, *text_right; } counterbutton_info[ED_NUM_COUNTERBUTTONS] = { + /* ---------- level and editor settings ---------------------------------- */ + { DX + 5 - SX, DY + 3 - SY, 1, 100, GADGET_ID_SELECT_LEVEL_DOWN, GADGET_ID_SELECT_LEVEL_UP, - GADGET_ID_SELECT_LEVEL_TEXT, + GADGET_ID_SELECT_LEVEL_TEXT, GADGET_ID_NONE, &level_nr, - NULL, NULL + NULL, NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(2), MIN_LEV_FIELDX, MAX_LEV_FIELDX, GADGET_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP, - GADGET_ID_LEVEL_XSIZE_TEXT, + GADGET_ID_LEVEL_XSIZE_TEXT, GADGET_ID_NONE, &level.fieldx, - "playfield size", "width", + "playfield size:", NULL, "width", }, { - ED_SETTINGS_XPOS(0) + 2 * DXSIZE, ED_COUNTER_YPOS(2), + -1, ED_COUNTER_YPOS(2), MIN_LEV_FIELDY, MAX_LEV_FIELDY, GADGET_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP, - GADGET_ID_LEVEL_YSIZE_TEXT, + GADGET_ID_LEVEL_YSIZE_TEXT, GADGET_ID_LEVEL_XSIZE_UP, &level.fieldy, - NULL, "height", + NULL, " ", "height", }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(3), 0, 999, - GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP, - GADGET_ID_LEVEL_COLLECT_TEXT, + 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 + "number of emeralds to collect:", NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4), 0, 999, GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP, - GADGET_ID_LEVEL_TIMELIMIT_TEXT, + GADGET_ID_LEVEL_TIMELIMIT_TEXT, GADGET_ID_NONE, &level.time, - "time available to solve level", "(0 => no time limit)" + "time available to solve level:", NULL, "(0 => no time limit)" }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(5), 0, 255, GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP, - GADGET_ID_LEVEL_TIMESCORE_TEXT, + GADGET_ID_LEVEL_TIMESCORE_TEXT, GADGET_ID_NONE, &level.score[SC_TIME_BONUS], - "score for each 10 seconds left", NULL + "score for each 10 seconds left:", NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(8), 1, 100, GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP, - GADGET_ID_LEVEL_RANDOM_TEXT, + GADGET_ID_LEVEL_RANDOM_TEXT, GADGET_ID_NONE, &random_placement_value, - "random element placement", "in" + "random element placement:", NULL, "in" }, + + /* ---------- element settings: configure (various elements) ------------- */ + { - ED_COUNT_ELEMENT_SCORE_XPOS, ED_COUNT_ELEMENT_SCORE_YPOS, + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), MIN_SCORE, MAX_SCORE, GADGET_ID_ELEMENT_SCORE_DOWN, GADGET_ID_ELEMENT_SCORE_UP, - GADGET_ID_ELEMENT_SCORE_TEXT, + GADGET_ID_ELEMENT_SCORE_TEXT, GADGET_ID_NONE, NULL, /* will be set when used */ - "element score", NULL + NULL, NULL, NULL }, { - ED_COUNT_ELEMENT_CONTENT_XPOS, ED_COUNT_ELEMENT_CONTENT_YPOS, + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(6), MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS, GADGET_ID_ELEMENT_CONTENT_DOWN, GADGET_ID_ELEMENT_CONTENT_UP, - GADGET_ID_ELEMENT_CONTENT_TEXT, - &level.num_yam_contents, - "element content", NULL + GADGET_ID_ELEMENT_CONTENT_TEXT, GADGET_ID_NONE, + &level.num_yamyam_contents, + NULL, NULL, "number of content areas" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), + MIN_ENVELOPE_XSIZE, MAX_ENVELOPE_XSIZE, + GADGET_ID_ENVELOPE_XSIZE_DOWN, GADGET_ID_ENVELOPE_XSIZE_UP, + GADGET_ID_ENVELOPE_XSIZE_TEXT, GADGET_ID_NONE, + NULL, + NULL, NULL, "width", + }, + { + -1, ED_SETTINGS_YPOS(0), + MIN_ENVELOPE_YSIZE, MAX_ENVELOPE_YSIZE, + GADGET_ID_ENVELOPE_YSIZE_DOWN, GADGET_ID_ENVELOPE_YSIZE_UP, + GADGET_ID_ENVELOPE_YSIZE_TEXT, GADGET_ID_ENVELOPE_XSIZE_UP, + NULL, + NULL, " ", "height", + }, + + /* ---------- element settings: configure (custom elements) ------------- */ + + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3), + MIN_SCORE, MAX_SCORE, + GADGET_ID_CUSTOM_SCORE_DOWN, GADGET_ID_CUSTOM_SCORE_UP, + GADGET_ID_CUSTOM_SCORE_TEXT, GADGET_ID_NONE, + &custom_element.collect_score, + NULL, "score", " " + }, + { + -1, ED_SETTINGS_YPOS(3), + MIN_COLLECT_COUNT, MAX_COLLECT_COUNT, + GADGET_ID_CUSTOM_GEMCOUNT_DOWN, GADGET_ID_CUSTOM_GEMCOUNT_UP, + GADGET_ID_CUSTOM_GEMCOUNT_TEXT, GADGET_ID_CUSTOM_SCORE_UP, + &custom_element.collect_count, + NULL, "count", NULL + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(4), + 0, 999, + GADGET_ID_PUSH_DELAY_FIX_DOWN, GADGET_ID_PUSH_DELAY_FIX_UP, + GADGET_ID_PUSH_DELAY_FIX_TEXT, GADGET_ID_NONE, + &custom_element.push_delay_fixed, + NULL, "push delay", NULL + }, + { + -1, ED_SETTINGS_YPOS(4), + 0, 999, + GADGET_ID_PUSH_DELAY_RND_DOWN, GADGET_ID_PUSH_DELAY_RND_UP, + GADGET_ID_PUSH_DELAY_RND_TEXT, GADGET_ID_PUSH_DELAY_FIX_UP, + &custom_element.push_delay_random, + NULL, "+random", NULL + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(7), + 0, 999, + GADGET_ID_MOVE_DELAY_FIX_DOWN, GADGET_ID_MOVE_DELAY_FIX_UP, + GADGET_ID_MOVE_DELAY_FIX_TEXT, GADGET_ID_NONE, + &custom_element.move_delay_fixed, + NULL, "move delay", NULL }, { - ED_COUNT_CHANGE_DELAY_XPOS, ED_SETTINGS_YPOS(2), + -1, ED_SETTINGS_YPOS(7), + 0, 999, + GADGET_ID_MOVE_DELAY_RND_DOWN, GADGET_ID_MOVE_DELAY_RND_UP, + GADGET_ID_MOVE_DELAY_RND_TEXT, GADGET_ID_MOVE_DELAY_FIX_UP, + &custom_element.move_delay_random, + NULL, "+random", NULL + }, + + /* ---------- element settings: advanced (custom elements) --------------- */ + + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(3), 0, 999, GADGET_ID_CHANGE_DELAY_FIX_DOWN, GADGET_ID_CHANGE_DELAY_FIX_UP, - GADGET_ID_CHANGE_DELAY_FIX_TEXT, - &custom_element.change.delay_fixed, - NULL, "units (fixed)" + GADGET_ID_CHANGE_DELAY_FIX_TEXT, GADGET_ID_NONE, + &custom_element_change.delay_fixed, + NULL, "delay", NULL, }, { - ED_COUNT_CHANGE_DELAY_XPOS, ED_SETTINGS_YPOS(3), + -1, ED_SETTINGS_YPOS(3), 0, 999, GADGET_ID_CHANGE_DELAY_RND_DOWN, GADGET_ID_CHANGE_DELAY_RND_UP, - GADGET_ID_CHANGE_DELAY_RND_TEXT, - &custom_element.change.delay_random, - NULL, "units (random)" - } + GADGET_ID_CHANGE_DELAY_RND_TEXT, GADGET_ID_CHANGE_DELAY_FIX_UP, + &custom_element_change.delay_random, + NULL, "+random", NULL + }, + { + 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, + NULL, "use random replace:", "%" + }, }; static struct @@ -695,7 +960,7 @@ static struct int gadget_id; int size; char *value; - char *infotext; + char *text_above, *infotext; } textinput_info[ED_NUM_TEXTINPUT] = { { @@ -703,95 +968,349 @@ static struct GADGET_ID_LEVEL_NAME, MAX_LEVEL_NAME_LEN, level.name, - "Title" + "Title:", "Title" }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(1), GADGET_ID_LEVEL_AUTHOR, MAX_LEVEL_AUTHOR_LEN, level.author, - "Author" + "Author:", "Author" + }, + { + 5 * MINI_TILEX, 5 * MINI_TILEY - ED_BORDER_SIZE, + GADGET_ID_ELEMENT_NAME, + MAX_ELEMENT_NAME_LEN - 2, /* currently 2 chars less editable */ + custom_element.description, + NULL, "Element name" + } +}; + +static struct +{ + int x, y; + int gadget_id; + int xsize, ysize; + char *value; + char *text_above, *infotext; +} textarea_info[ED_NUM_TEXTAREAS] = +{ + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), + GADGET_ID_ENVELOPE_INFO, + MAX_ENVELOPE_XSIZE, MAX_ENVELOPE_YSIZE, + NULL, + "Envelope Info:", "Envelope Info" } }; +static struct ValueTextInfo options_access_type[] = +{ + { EP_WALKABLE, "walk" }, + { EP_PASSABLE, "pass" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_access_layer[] = +{ + { EP_ACCESSIBLE_OVER, "over" }, + { EP_ACCESSIBLE_INSIDE, "inside" }, + { EP_ACCESSIBLE_UNDER, "under" }, + { -1, NULL } +}; + static struct ValueTextInfo options_walk_to_action[] = { - { EP_DIGGABLE, "diggable" }, - { EP_COLLECTIBLE, "collectible" }, - { EP_PUSHABLE, "pushable" }, - { -1, NULL } + { EP_DIGGABLE, "diggable" }, + { EP_COLLECTIBLE_ONLY, "collectible" }, + { EP_DROPPABLE, "collectible & droppable" }, + { EP_PUSHABLE, "pushable" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_move_pattern[] = +{ + { MV_LEFT, "left" }, + { MV_RIGHT, "right" }, + { MV_UP, "up" }, + { MV_DOWN, "down" }, + { MV_HORIZONTAL, "horizontal" }, + { MV_VERTICAL, "vertical" }, + { MV_ALL_DIRECTIONS, "all directions" }, + { MV_TOWARDS_PLAYER, "towards player" }, + { MV_AWAY_FROM_PLAYER, "away from player" }, + { MV_ALONG_LEFT_SIDE, "along left side" }, + { MV_ALONG_RIGHT_SIDE, "along right side" }, + { MV_TURNING_LEFT, "turning left" }, + { MV_TURNING_RIGHT, "turning right" }, + { MV_WHEN_PUSHED, "when pushed" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_move_direction[] = +{ + { MV_NO_MOVING, "automatic" }, + { MV_LEFT, "left" }, + { MV_RIGHT, "right" }, + { MV_UP, "up" }, + { MV_DOWN, "down" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_move_stepsize[] = +{ + { 1, "very slow" }, + { 2, "slow" }, + { 4, "normal" }, + { 8, "fast" }, + { 16, "very fast" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_smash_targets[] = +{ + { EP_CAN_SMASH_PLAYER, "player" }, +#if 0 + { EP_CAN_SMASH_ENEMIES, "enemies" }, +#endif + { EP_CAN_SMASH_EVERYTHING, "everything" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_slippery_type[] = +{ + { SLIPPERY_ANY_RANDOM, "random" }, + { SLIPPERY_ANY_LEFT_RIGHT, "left, right" }, + { SLIPPERY_ANY_RIGHT_LEFT, "right, left" }, + { SLIPPERY_ONLY_LEFT, "only left" }, + { SLIPPERY_ONLY_RIGHT, "only right" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_deadliness[] = +{ + { EP_DONT_RUN_INTO, "running into" }, + { EP_DONT_COLLIDE_WITH, "colliding with" }, + { EP_DONT_TOUCH, "touching" }, + { -1, NULL } }; -static int index_walk_to_action = 0; -static struct ValueTextInfo options_walkable_layer[] = +static struct ValueTextInfo options_consistency[] = { - { EP_WALKABLE_OVER, "over" }, - { EP_WALKABLE_INSIDE, "inside" }, - { EP_WALKABLE_UNDER, "under" }, - { -1, NULL } + { EP_CAN_EXPLODE_3X3, "can explode 3x3" }, + { EP_CAN_EXPLODE_1X1, "can explode 1x1" }, + { EP_INDESTRUCTIBLE, "indestructible" }, + { -1, NULL } }; -static int index_walkable_layer = 0; static struct ValueTextInfo options_time_units[] = { - { 50, "seconds" }, - { 1, "frames" }, - { -1, NULL } + { 1, "frames" }, + { FRAMES_PER_SECOND, "seconds" }, + { -1, NULL } }; -static int index_time_units = 0; -static struct ValueTextInfo options_change_cause[] = +static struct ValueTextInfo options_change_direct_action[] = +{ + { CE_TOUCHED_BY_PLAYER, "touched by player ..." }, + { CE_PRESSED_BY_PLAYER, "pressed by player ..." }, + { CE_PUSHED_BY_PLAYER, "pushed by player ..." }, + { CE_ENTERED_BY_PLAYER, "entered by player ..." }, + { CE_LEFT_BY_PLAYER, "left by player ..." }, + { CE_DROPPED_BY_PLAYER, "dropped by player" }, + { CE_SWITCHED, "switched ..." }, + { CE_COLLISION, "collision ..." }, + { CE_IMPACT, "impact" }, + { CE_SMASHED, "smashed" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_change_other_action[] = +{ + { CE_OTHER_GETS_TOUCHED, "player touches ..." }, + { CE_OTHER_GETS_PRESSED, "player presses ..." }, + { CE_OTHER_GETS_PUSHED, "player pushes ..." }, + { CE_OTHER_GETS_ENTERED, "player enters ..." }, + { CE_OTHER_GETS_LEFT, "player leaves ..." }, + { CE_OTHER_GETS_DIGGED, "player digs" }, + { CE_OTHER_GETS_COLLECTED, "player collects" }, + { CE_OTHER_GETS_DROPPED, "player drops" }, + { CE_OTHER_IS_TOUCHING, "touching ..." }, + { CE_OTHER_IS_SWITCHING, "switch of ..." }, + { CE_OTHER_IS_CHANGING, "change of" }, + { CE_OTHER_IS_EXPLODING, "explosion of" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_change_sides[] = +{ + { 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, "all sides" }, + { -1, NULL } +}; + +static struct ValueTextInfo options_change_power[] = +{ + { CP_NON_DESTRUCTIVE, "empty" }, + { CP_HALF_DESTRUCTIVE, "diggable" }, + { CP_FULL_DESTRUCTIVE, "destructible" }, + { -1, NULL } +}; + +static char options_change_page_strings[MAX_CHANGE_PAGES][10]; +static struct ValueTextInfo options_change_page[MAX_CHANGE_PAGES + 1] = { - { 1, "specified delay" }, - { 2, "impact (active)" }, - { 3, "impact (passive)" }, - { 4, "touched by player" }, - { 5, "pressed by player" }, - { -1, NULL } + { -1, NULL } }; -static int index_change_cause = 0, value_change_cause = 0; static struct { int x, y; int gadget_id; - int size; /* size of selectbox (chars) or '0' (dynamically determined) */ + int gadget_id_align; + int size; /* char size of selectbox or '-1' (dynamically determined) */ struct ValueTextInfo *options; - int *index, *value; - char *text, *infotext; + int *value; + char *text_left, *text_right, *infotext; } selectbox_info[ED_NUM_SELECTBOX] = { + /* ---------- element settings: configure (custom elements) ------------- */ + { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(4), - GADGET_ID_CUSTOM_WALK_TO_ACTION, - 0, - options_walk_to_action, &index_walk_to_action, + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(1), + GADGET_ID_CUSTOM_ACCESS_TYPE, GADGET_ID_NONE, + -1, + options_access_type, + &custom_element.access_type, + "player can", NULL, "type of access to this field" + }, + { + -1, ED_SETTINGS_YPOS(1), + GADGET_ID_CUSTOM_ACCESS_LAYER, GADGET_ID_CUSTOM_ACCESS_TYPE, + -1, + options_access_layer, + &custom_element.access_layer, + NULL, NULL, "layer of access for this field" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(2), + GADGET_ID_CUSTOM_WALK_TO_ACTION, GADGET_ID_NONE, + -1, + options_walk_to_action, &custom_element.walk_to_action, - NULL, "diggable, collectible or pushable" + NULL, NULL, "diggable/collectible/pushable" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(9), - GADGET_ID_CUSTOM_WALKABLE_LAYER, - 0, - options_walkable_layer, &index_walkable_layer, - &custom_element.walkable_layer, - "player can walk", "layer where player can walk" + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(5), + GADGET_ID_CUSTOM_MOVE_PATTERN, GADGET_ID_NONE, + -1, + options_move_pattern, + &custom_element.move_pattern, + "can move", NULL, "element move direction" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(6), + GADGET_ID_CUSTOM_MOVE_DIRECTION, GADGET_ID_NONE, + -1, + options_move_direction, + &custom_element.move_direction_initial, + "starts moving", NULL, "initial element move direction" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(8), + GADGET_ID_CUSTOM_MOVE_STEPSIZE, GADGET_ID_NONE, + -1, + options_move_stepsize, + &custom_element.move_stepsize, + "move/fall speed", NULL, "speed of element movement" + }, + { + -1, ED_SETTINGS_YPOS(9), + GADGET_ID_CUSTOM_SMASH_TARGETS, GADGET_ID_CUSTOM_CAN_SMASH, + -1, + options_smash_targets, + &custom_element.smash_targets, + "can smash", NULL, "elements that can be smashed" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(10), + GADGET_ID_CUSTOM_SLIPPERY_TYPE, GADGET_ID_NONE, + -1, + options_slippery_type, + &custom_element.slippery_type, + "slippery", NULL, "where other elements fall down" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(11), + GADGET_ID_CUSTOM_DEADLINESS, GADGET_ID_NONE, + -1, + options_deadliness, + &custom_element.deadliness, + "deadly when", NULL, "deadliness of element" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(12), + GADGET_ID_CUSTOM_CONSISTENCY, GADGET_ID_NONE, + -1, + options_consistency, + &custom_element.consistency, + NULL, NULL, "consistency/destructibility" }, + + /* ---------- element settings: advanced (custom elements) --------------- */ + { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(4), - GADGET_ID_CHANGE_TIME_UNITS, - 0, - options_time_units, &index_time_units, - &custom_element.change.delay_frames, - "delay units given in", "time units for change" + GADGET_ID_CHANGE_TIME_UNITS, GADGET_ID_NONE, + -1, + options_time_units, + &custom_element_change.delay_frames, + "delay time given in", NULL, "delay time units for change" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(5), + GADGET_ID_CHANGE_DIRECT_ACTION, GADGET_ID_NONE, + -1, + options_change_direct_action, + &custom_element_change.direct_action, + NULL, NULL, "type of direct action" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(6), + GADGET_ID_CHANGE_OTHER_ACTION, GADGET_ID_NONE, + -1, + options_change_other_action, + &custom_element_change.other_action, + NULL, "element:", "type of other element action" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(7), + GADGET_ID_CHANGE_SIDES, GADGET_ID_NONE, + -1, + options_change_sides, + &custom_element_change.sides, + "... at", NULL, "element side that causes change" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(10), + GADGET_ID_CHANGE_POWER, GADGET_ID_NONE, + -1, + options_change_power, + &custom_element_change.power, + "replace when", NULL, "which elements can be replaced" }, { - ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(8), - GADGET_ID_CHANGE_CAUSE, - 0, - options_change_cause, &index_change_cause, - &value_change_cause, - "test:", "test-selectbox entry" + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(14), + GADGET_ID_SELECT_CHANGE_PAGE, GADGET_ID_NONE, + 3, + options_change_page, + &custom_element.current_change_page, + NULL, NULL, "element config page" }, }; @@ -799,34 +1318,79 @@ static struct { int x, y; int gadget_id; + int gadget_id_align; int size; - char *value; - char *infotext; -} textbutton_info[ED_NUM_TEXTBUTTON] = + char *text; + char *text_left, *text_right, *infotext; +} textbutton_info[ED_NUM_TEXTBUTTONS] = { { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(1), - GADGET_ID_PROPERTIES_INFO, - 11, "Information", - "Show information about element" + GADGET_ID_PROPERTIES_INFO, GADGET_ID_NONE, + 11, "Information", + NULL, NULL, "Show information about element" }, { ED_SETTINGS_XPOS(0) + 166, ED_COUNTER_YPOS(1), - GADGET_ID_PROPERTIES_CONFIG, - 11, "Configure", - "Configure element properties" + GADGET_ID_PROPERTIES_CONFIG, GADGET_ID_NONE, + 11, "Configure", + NULL, NULL, "Configure element properties" }, { ED_SETTINGS_XPOS(0) + 332, ED_COUNTER_YPOS(1), - GADGET_ID_PROPERTIES_ADVANCED, - 11, "Advanced", - "Advanced element configuration" + GADGET_ID_PROPERTIES_ADVANCED, GADGET_ID_NONE, + 11, "Advanced", + NULL, NULL, "Advanced element configuration" + }, + { + -1, ED_SETTINGS_YPOS(13), + GADGET_ID_SAVE_AS_TEMPLATE, GADGET_ID_CUSTOM_USE_TEMPLATE, + -1, "Save as template", + " ", NULL, "Save current settings as new template" + }, + { + -1, ED_SETTINGS_YPOS(14), + GADGET_ID_ADD_CHANGE_PAGE, GADGET_ID_NEXT_CHANGE_PAGE, + -1, "New", + " ", NULL, "Add new config page" + }, + { + -1, ED_SETTINGS_YPOS(14), + GADGET_ID_DEL_CHANGE_PAGE, GADGET_ID_ADD_CHANGE_PAGE, + -1, "Delete", + NULL, NULL, "Delete current config page" + }, +}; + +static struct +{ + int gd_x, gd_y; + int x, y; + int width, height; + int gadget_id; + int gadget_id_align; + char *text_left, *text_right, *infotext; +} graphicbutton_info[ED_NUM_GRAPHICBUTTONS] = +{ + { + ED_BUTTON_MINUS_XPOS, ED_BUTTON_COUNT_YPOS, + 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 config page" + }, + { + ED_BUTTON_PLUS_XPOS, ED_BUTTON_COUNT_YPOS, + -1, ED_SETTINGS_YPOS(14), + ED_BUTTON_COUNT_XSIZE, ED_BUTTON_COUNT_YSIZE, + GADGET_ID_NEXT_CHANGE_PAGE, GADGET_ID_SELECT_CHANGE_PAGE, + NULL, "config page", "select next config page" }, }; static struct { - int xpos, ypos; + int gd_x, gd_y; int x, y; int gadget_id; char *infotext; @@ -864,15 +1428,15 @@ static struct }, { ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 1 * ED_SCROLLBUTTON2_YSIZE, - ED_SCROLL2_DOWN_XPOS, ED_SCROLL2_DOWN_YPOS, + ED_SCROLL2_DOWN_XPOS, ED_SCROLL2_DOWN_YPOS, GADGET_ID_SCROLL_LIST_DOWN, "scroll element list down ('Page Down')" - } + }, }; static struct { - int xpos, ypos; + int gd_x, gd_y; int x, y; int width, height; int type; @@ -910,25 +1474,26 @@ static struct { int x, y; int gadget_id; + int gadget_id_align; int radio_button_nr; int *value; int checked_value; - char *text, *infotext; + char *text_left, *text_right, *infotext; } radiobutton_info[ED_NUM_RADIOBUTTONS] = { { - ED_SETTINGS_XPOS(0) + 160, ED_COUNTER2_YPOS(8), - GADGET_ID_RANDOM_PERCENTAGE, + -1, ED_COUNTER2_YPOS(8), + GADGET_ID_RANDOM_PERCENTAGE, GADGET_ID_LEVEL_RANDOM_UP, RADIO_NR_RANDOM_ELEMENTS, &random_placement_method, RANDOM_USE_PERCENTAGE, - "percentage", "use percentage for random elements" + " ", "percentage", "use percentage for random elements" }, { - ED_SETTINGS_XPOS(0) + 340, ED_COUNTER2_YPOS(8), - GADGET_ID_RANDOM_QUANTITY, + -1, ED_COUNTER2_YPOS(8), + GADGET_ID_RANDOM_QUANTITY, GADGET_ID_RANDOM_PERCENTAGE, RADIO_NR_RANDOM_ELEMENTS, &random_placement_method, RANDOM_USE_QUANTITY, - "quantity", "use quantity for random elements" + " ", "quantity", "use quantity for random elements" } }; @@ -936,126 +1501,334 @@ static struct { int x, y; int gadget_id; + int gadget_id_align; boolean *value; - char *text, *infotext; + char *text_left, *text_right, *infotext; } checkbutton_info[ED_NUM_CHECKBUTTONS] = { + /* ---------- level and editor settings ---------------------------------- */ + { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(6) - MINI_TILEY, - GADGET_ID_DOUBLE_SPEED, + GADGET_ID_DOUBLE_SPEED, GADGET_ID_NONE, &level.double_speed, - "double speed movement", "set movement speed of player" + NULL, "double speed movement", "set movement speed of player" }, { - ED_SETTINGS_XPOS(0) + 340, ED_COUNTER_YPOS(6) - MINI_TILEY, - GADGET_ID_GRAVITY, - &level.gravity, - "gravity", "set level gravity" + -1, ED_COUNTER_YPOS(6) - MINI_TILEY, + GADGET_ID_GRAVITY, GADGET_ID_DOUBLE_SPEED, + &level.initial_gravity, + " ", "gravity", "set level gravity" }, { ED_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(9) - MINI_TILEY, - GADGET_ID_RANDOM_RESTRICTED, + GADGET_ID_RANDOM_RESTRICTED, GADGET_ID_NONE, &random_placement_background_restricted, - "restrict random placement to", "set random placement restriction" + NULL, + "restrict random placement to:", "set random placement restriction" }, + + /* ---------- element settings: configure (various elements) ------------- */ + { ED_SETTINGS_XPOS(0), 0, /* set at runtime */ - GADGET_ID_STICK_ELEMENT, + GADGET_ID_STICK_ELEMENT, GADGET_ID_NONE, &stick_element_properties_window, + NULL, "stick this screen to edit content","stick this screen to edit content" }, { ED_SETTINGS_XPOS(0), ED_COUNTER_YPOS(4), - GADGET_ID_EM_SLIPPERY_GEMS, + GADGET_ID_EM_SLIPPERY_GEMS, GADGET_ID_NONE, &level.em_slippery_gems, + NULL, "slip down from certain flat walls","use EM style slipping behaviour" }, + + /* ---------- element settings: configure (custom elements) ------------- */ + { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(3), - GADGET_ID_CUSTOM_INDESTRUCTIBLE, - &custom_element_properties[EP_INDESTRUCTIBLE], - "indestructible", "element cannot be destroyed" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), + GADGET_ID_CUSTOM_ACCESSIBLE, GADGET_ID_NONE, + &custom_element_properties[EP_ACCESSIBLE], + NULL, NULL, "player can walk to or pass this field" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(4), - GADGET_ID_CUSTOM_WALK_TO_OBJECT, + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), + GADGET_ID_CUSTOM_WALK_TO_OBJECT, GADGET_ID_NONE, &custom_element_properties[EP_WALK_TO_OBJECT], - NULL, "player can dig/collect/push element" + NULL, NULL, "player can dig/collect/push element" }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(5), - GADGET_ID_CUSTOM_CAN_FALL, + GADGET_ID_CUSTOM_CAN_MOVE, GADGET_ID_NONE, + &custom_element_properties[EP_CAN_MOVE], + NULL, NULL, "element can move in some direction" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(9), + GADGET_ID_CUSTOM_CAN_FALL, GADGET_ID_NONE, &custom_element_properties[EP_CAN_FALL], - "can fall", "element can fall down" + NULL, "can fall", "element can fall down" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(6), - GADGET_ID_CUSTOM_CAN_SMASH, + -1, ED_SETTINGS_YPOS(9), + GADGET_ID_CUSTOM_CAN_SMASH, GADGET_ID_CUSTOM_CAN_FALL, &custom_element_properties[EP_CAN_SMASH], - "can smash", "element can smash other elements" + " ", NULL, "element can smash other elements" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(7), - GADGET_ID_CUSTOM_CAN_MOVE, - &custom_element_properties[EP_CAN_MOVE], - "can move", "element can move in some direction" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(10), + GADGET_ID_CUSTOM_SLIPPERY, GADGET_ID_NONE, + &custom_element_properties[EP_SLIPPERY], + NULL, NULL, "other elements can fall down from it" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(8), - GADGET_ID_CUSTOM_SLIPPERY, - &custom_element_properties[EP_SLIPPERY], - "slippery", "other elements can fall down from it" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(11), + GADGET_ID_CUSTOM_DEADLY, GADGET_ID_NONE, + &custom_element_properties[EP_DEADLY], + NULL, NULL, "element can kill the player" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(9), - GADGET_ID_CUSTOM_WALKABLE, - &custom_element_properties[EP_WALKABLE], - NULL, "player can walk on the same field" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(12), + GADGET_ID_CUSTOM_EXPLODE_RESULT, GADGET_ID_NONE, + &custom_element_properties[EP_EXPLODE_RESULT], + NULL, NULL, "set consistency/destructibility" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), - GADGET_ID_CUSTOM_USE_GRAPHIC, - &custom_element.use_gfx_element, - "use graphic of element:", "use optional custom graphic element" + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13), + GADGET_ID_CUSTOM_EXPLODE_FIRE, GADGET_ID_NONE, + &custom_element.can_explode_by_fire, + NULL, "by fire", "element can explode by fire/explosion" + }, + { + -1, ED_SETTINGS_YPOS(13), + GADGET_ID_CUSTOM_EXPLODE_SMASH, GADGET_ID_CUSTOM_EXPLODE_FIRE, + &custom_element.can_explode_smashed, + " ", "smashed", "element can explode when smashed" }, + { + -1, ED_SETTINGS_YPOS(13), + GADGET_ID_CUSTOM_EXPLODE_IMPACT, GADGET_ID_CUSTOM_EXPLODE_SMASH, + &custom_element.can_explode_impact, + " ", "impact", "element can explode on impact" + }, + + /* ---------- element settings: advanced (custom elements) --------------- */ + { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), - GADGET_ID_CUSTOM_CHANGEABLE, - &custom_element_properties[EP_CHANGEABLE], - "element changes to after:", "element can change to other element" + GADGET_ID_CUSTOM_USE_GRAPHIC, GADGET_ID_NONE, + &custom_element.use_gfx_element, + NULL, "use graphic of element:", "use graphic for custom element" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(2), - GADGET_ID_CHANGE_DELAY_FIXED, - &custom_element_change_events[CE_DELAY_FIXED], - "delay of", "element changes after fixed delay" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), + GADGET_ID_CUSTOM_CAN_CHANGE, GADGET_ID_NONE, + &custom_element_change.can_change, + NULL, "element changes to:", "element can change to other element" }, { ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3), - GADGET_ID_CHANGE_DELAY_RANDOM, - &custom_element_change_events[CE_DELAY_RANDOM], - "delay of", "element changes after random delay" - } + GADGET_ID_CHANGE_DELAY, GADGET_ID_NONE, + &custom_element_change_events[CE_DELAY], + NULL, NULL, "element changes after delay" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(5), + GADGET_ID_CHANGE_BY_DIRECT_ACT, GADGET_ID_NONE, + &custom_element_change_events[CE_BY_DIRECT_ACTION], + NULL, NULL, "element changes by direct action" + }, + { + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(6), + GADGET_ID_CHANGE_BY_OTHER_ACT, GADGET_ID_NONE, + &custom_element_change_events[CE_BY_OTHER_ACTION], + NULL, NULL, "element changes by other element" + }, + { + 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(9), + GADGET_ID_CHANGE_USE_CONTENT, GADGET_ID_NONE, + &custom_element_change.use_content, + NULL, "use extended change target:","element changes to more elements" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(11), + GADGET_ID_CHANGE_ONLY_COMPLETE, GADGET_ID_NONE, + &custom_element_change.only_complete, + NULL, "replace all or nothing", "only replace when all can be changed" + }, + { + ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(12), + GADGET_ID_CHANGE_USE_RANDOM, GADGET_ID_NONE, + &custom_element_change.use_random_change, + NULL, NULL, "use percentage for random replace" + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(13), + GADGET_ID_CUSTOM_USE_TEMPLATE, GADGET_ID_NONE, + &level.use_custom_template, + NULL, "use template", "use template for custom properties" + }, }; +static struct +{ + int x, y; + int area_xsize, area_ysize; + int gadget_id; + int gadget_id_align; + char *text_left, *text_right, *text_below; +} drawingarea_info[ED_NUM_DRAWING_AREAS] = +{ + /* ---------- level playfield content ------------------------------------ */ -/* - ----------------------------------------------------------------------------- - some internally used variables - ----------------------------------------------------------------------------- -*/ + { + 0, 0, + MAX_ED_FIELDX, MAX_ED_FIELDY, + GADGET_ID_DRAWING_LEVEL, GADGET_ID_NONE, + NULL, NULL, NULL + }, -/* actual size of level editor drawing area */ -static int ed_fieldx = MAX_ED_FIELDX - 1, ed_fieldy = MAX_ED_FIELDY - 1; + /* ---------- yam yam content -------------------------------------------- */ -/* actual position of level editor drawing area in level playfield */ -static int level_xpos = -1, level_ypos = -1; + { + ED_AREA_YAMYAM_CONTENT_XPOS(0), ED_AREA_YAMYAM_CONTENT_YPOS(0), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_0, GADGET_ID_NONE, + NULL, NULL, "1" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(1), ED_AREA_YAMYAM_CONTENT_YPOS(1), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_1, GADGET_ID_NONE, + NULL, NULL, "2" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(2), ED_AREA_YAMYAM_CONTENT_YPOS(2), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_2, GADGET_ID_NONE, + NULL, NULL, "3" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(3), ED_AREA_YAMYAM_CONTENT_YPOS(3), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_3, GADGET_ID_NONE, + NULL, NULL, "4" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(4), ED_AREA_YAMYAM_CONTENT_YPOS(4), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_4, GADGET_ID_NONE, + NULL, NULL, "5" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(5), ED_AREA_YAMYAM_CONTENT_YPOS(5), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_5, GADGET_ID_NONE, + NULL, NULL, "6" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(6), ED_AREA_YAMYAM_CONTENT_YPOS(6), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_6, GADGET_ID_NONE, + NULL, NULL, "7" + }, + { + ED_AREA_YAMYAM_CONTENT_XPOS(7), ED_AREA_YAMYAM_CONTENT_YPOS(7), + 3, 3, + GADGET_ID_ELEMENT_CONTENT_7, GADGET_ID_NONE, + NULL, NULL, "8" + }, -#define IN_ED_FIELD(x,y) ((x)>=0 && (x)=0 &&(y)=0 && (x)=0 &&(y)x + gi->width + getTextWidthForGadget(text)); +} + +static char *getElementInfoText(int element) +{ + char *info_text = NULL; + + if (element < NUM_FILE_ELEMENTS) + { + if (strlen(element_info[element].description) > 0) + info_text = element_info[element].description; + else if (element_info[element].custom_description != NULL) + info_text = element_info[element].custom_description; + else if (element_info[element].editor_description != NULL) + info_text = element_info[element].editor_description; + } + + if (info_text == NULL) + info_text = INFOTEXT_UNKNOWN_ELEMENT; + + return info_text; +} + static void ReinitializeElementList() { + static boolean initialized = FALSE; int pos = 0; int i, j; if (editor_elements != NULL) free(editor_elements); + /* do some sanity check for each element from element list at startup */ + if (!initialized) + { + for (i=0; editor_elements_info[i].setup_value != NULL; i++) + { + for (j=0; j < *editor_elements_info[i].element_list_size; j++) + { + int element = editor_elements_info[i].element_list[j]; + + if (element >= NUM_FILE_ELEMENTS) + Error(ERR_WARN, "editor element %d is runtime element", element); + + if (strcmp(getElementInfoText(element), INFOTEXT_UNKNOWN_ELEMENT) == 0) + Error(ERR_WARN, "no element description for element %d", element); + } + } + + initialized = TRUE; + } + num_editor_elements = 0; /* determine size of element list */ for (i=0; editor_elements_info[i].setup_value != NULL; i++) + { if (*editor_elements_info[i].setup_value) + { + if (setup.editor.el_headlines) + num_editor_elements += *editor_elements_info[i].headline_list_size; + num_editor_elements += *editor_elements_info[i].element_list_size; + } + } if (num_editor_elements < ED_NUM_ELEMENTLIST_BUTTONS) { @@ -1907,21 +3017,41 @@ static void ReinitializeElementList() /* fill element list */ for (i=0; editor_elements_info[i].setup_value != NULL; i++) + { if (*editor_elements_info[i].setup_value) - for (j=0; j<*editor_elements_info[i].element_list_size; j++) + { + if (setup.editor.el_headlines) + for (j=0; j < *editor_elements_info[i].headline_list_size; j++) + editor_elements[pos++] = editor_elements_info[i].headline_list[j]; + + for (j=0; j < *editor_elements_info[i].element_list_size; j++) editor_elements[pos++] = editor_elements_info[i].element_list[j]; + } + } + + /* correct position of element list scrollbar */ + if (element_shift < 0) + element_shift = 0; + if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS) + element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS; } static void ReinitializeElementListButtons() { + static boolean last_setup_value_headlines = FALSE; static boolean initialization_needed = TRUE; int i; if (!initialization_needed) /* check if editor element setup has changed */ + { + if (last_setup_value_headlines != setup.editor.el_headlines) + initialization_needed = TRUE; + for (i=0; editor_elements_info[i].setup_value != NULL; i++) if (editor_elements_info[i].last_setup_value != *editor_elements_info[i].setup_value) initialization_needed = TRUE; + } if (!initialization_needed) return; @@ -1930,6 +3060,7 @@ static void ReinitializeElementListButtons() CreateLevelEditorGadgets(); /* store current setup values for next invocation of this function */ + last_setup_value_headlines = setup.editor.el_headlines; for (i=0; editor_elements_info[i].setup_value != NULL; i++) editor_elements_info[i].last_setup_value = *editor_elements_info[i].setup_value; @@ -1937,36 +3068,70 @@ static void ReinitializeElementListButtons() initialization_needed = FALSE; } -static int getCounterGadgetWidth() +static void DrawElementBorder(int dest_x, int dest_y, int width, int height, + boolean input) { - return (DXSIZE + getFontWidth(FONT_INPUT_1) - 2 * ED_GADGET_DISTANCE); -} + int border_graphic = + (input ? IMG_EDITOR_ELEMENT_BORDER_INPUT : IMG_EDITOR_ELEMENT_BORDER); + Bitmap *src_bitmap; + int src_x, src_y; + int num_mini_tilex = width / MINI_TILEX + 1; + int num_mini_tiley = width / MINI_TILEY + 1; + int x, y; -static int getMaxInfoTextLength() -{ - return (SXSIZE / getFontWidth(FONT_TEXT_2)); + getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y); + + for (y=0; y < num_mini_tiley; y++) + for (x=0; x < num_mini_tilex; x++) + BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY, + dest_x - MINI_TILEX / 2 + x * MINI_TILEX, + dest_y - MINI_TILEY / 2 + y * MINI_TILEY); + + ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2); } -static char *getElementInfoText(int element) +static void DrawDrawingArea(int id) { - char *info_text = NULL; - - if (element < NUM_FILE_ELEMENTS) - { - if (element_info[element].custom_description != NULL) - info_text = element_info[element].custom_description; - else if (element_info[element].editor_description != NULL) - info_text = element_info[element].editor_description; - } + struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; + int x, y; - if (info_text == NULL) + if (id == ED_DRAWING_ID_RANDOM_BACKGROUND) + DrawMiniGraphicExt(drawto, gi->x, gi->y, + el2edimg(random_placement_background_element)); + else if (id == ED_DRAWING_ID_AMOEBA_CONTENT) + DrawMiniGraphicExt(drawto, gi->x, gi->y, el2edimg(level.amoeba_content)); + else if (id == ED_DRAWING_ID_CUSTOM_GRAPHIC) + DrawMiniGraphicExt(drawto, gi->x, gi->y, + el2edimg(custom_element.gfx_element)); + else if (id == ED_DRAWING_ID_CUSTOM_CONTENT) + for (y=0; y<3; y++) + for (x=0; x<3; x++) + DrawMiniGraphicExt(drawto, + gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, + el2edimg(custom_element.content[x][y])); + else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_TARGET) + DrawMiniGraphicExt(drawto, gi->x, gi->y, + el2edimg(custom_element_change.target_element)); + else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT) + for (y=0; y < 3; y++) + 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])); + else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER) + DrawMiniGraphicExt(drawto, gi->x, gi->y, + el2edimg(custom_element_change.trigger_element)); + else if (id >= ED_DRAWING_ID_ELEMENT_CONTENT_0 && + id <= ED_DRAWING_ID_ELEMENT_CONTENT_7) { - info_text = "unknown"; + int nr = id - ED_DRAWING_ID_ELEMENT_CONTENT_0; - Error(ERR_WARN, "no element description for element %d", element); + for (y=0; y < 3; y++) + for (x=0; x < 3; x++) + DrawMiniGraphicExt(drawto, + gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, + el2edimg(level.yamyam_content[nr][x][y])); } - - return info_text; } static void ScrollMiniLevel(int from_x, int from_y, int scroll) @@ -2119,8 +3284,8 @@ static void CreateControlButtons() y += DY; width = ED_SCROLLBUTTON2_XSIZE; height = ED_SCROLLBUTTON2_YSIZE; - gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos; - gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos; + gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].gd_x; + gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].gd_y; gd_x2 = gd_x1 - ED_SCROLLBUTTON2_XSIZE; gd_y2 = gd_y1; } @@ -2130,8 +3295,8 @@ static void CreateControlButtons() y += SY; width = ED_SCROLLBUTTON_XSIZE; height = ED_SCROLLBUTTON_YSIZE; - gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos; - gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos; + gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].gd_x; + gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].gd_y; gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE; gd_y2 = gd_y1; } @@ -2159,7 +3324,7 @@ static void CreateControlButtons() } /* create buttons for element list */ - for (i=0; iwidth + ED_GADGET_DISTANCE; /* xpos of text count button */ + right_gadget_border[id] = + getRightGadgetBorder(gi, counterbutton_info[i].text_right); + + x += gi->width + ED_GADGET_DISTANCE; /* text count button */ if (j == 0) { @@ -2303,8 +3480,8 @@ static void CreateCounterButtons() font_type = FONT_LEVEL_NUMBER; font_type_active = FONT_LEVEL_NUMBER; - xpos += 2 * ED_GADGET_DISTANCE; - ypos -= ED_GADGET_DISTANCE; + x += 2 * ED_GADGET_DISTANCE; + y -= ED_GADGET_DISTANCE; gd_x = DOOR_GFX_PAGEX6 + ED_WIN_COUNT2_XPOS; gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT2_YPOS; @@ -2319,9 +3496,9 @@ static void CreateCounterButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, GDI_INFO_TEXT, "enter counter value", - GDI_X, xpos, - GDI_Y, ypos, - GDI_TYPE, GD_TYPE_TEXTINPUT_NUMERIC, + GDI_X, x, + GDI_Y, y, + GDI_TYPE, GD_TYPE_TEXT_INPUT_NUMERIC, GDI_NUMBER_VALUE, 0, GDI_NUMBER_MIN, counterbutton_info[i].min_value, GDI_NUMBER_MAX, counterbutton_info[i].max_value, @@ -2341,7 +3518,10 @@ static void CreateCounterButtons() Error(ERR_EXIT, "cannot create gadget"); level_editor_gadget[id] = gi; - xpos += gi->width + ED_GADGET_DISTANCE; /* xpos of up count button */ + right_gadget_border[id] = + getRightGadgetBorder(gi, counterbutton_info[i].text_right); + + x += gi->width + ED_GADGET_DISTANCE; /* up count button */ } } } @@ -2349,47 +3529,37 @@ static void CreateCounterButtons() static void CreateDrawingAreas() { - struct GadgetInfo *gi; - unsigned long event_mask; - int id; int i; - event_mask = - GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING | - GD_EVENT_OFF_BORDERS; - - /* one for the level drawing area ... */ - id = GADGET_ID_DRAWING_LEVEL; - gi = CreateGadget(GDI_CUSTOM_ID, id, - GDI_X, SX, - GDI_Y, SY, - GDI_TYPE, GD_TYPE_DRAWING_AREA, - GDI_AREA_SIZE, ed_fieldx, ed_fieldy, - GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY, - GDI_EVENT_MASK, event_mask, - GDI_CALLBACK_INFO, HandleDrawingAreaInfo, - GDI_CALLBACK_ACTION, HandleDrawingAreas, - GDI_END); + for (i=0; i' operation will - implicitely cast -1 to an unsigned integer value!) */ + event_mask = GD_EVENT_TEXT_LEAVING; - for (j=0; selectbox_info[i].options[j].text != NULL; j++) - if (strlen(selectbox_info[i].options[j].text) > selectbox_info[i].size) - selectbox_info[i].size = strlen(selectbox_info[i].options[j].text); + gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS; + gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS; - selectbox_info[i].size++; /* add one character empty space */ - } + sprintf(infotext, "Enter %s", textarea_info[i].infotext); + infotext[max_infotext_len] = '\0'; - event_mask = GD_EVENT_RELEASED | - GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING; + gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_CUSTOM_TYPE_ID, i, + GDI_INFO_TEXT, infotext, + GDI_X, SX + textarea_info[i].x, + GDI_Y, SY + textarea_info[i].y, + GDI_TYPE, GD_TYPE_TEXT_AREA, + GDI_AREA_SIZE, area_xsize, area_ysize, + GDI_TEXT_FONT, FONT_INPUT_1, + GDI_TEXT_FONT_ACTIVE, FONT_INPUT_1_ACTIVE, + GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y, + GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y, + GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE, + GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE, + GDI_EVENT_MASK, event_mask, + GDI_CALLBACK_INFO, HandleEditorGadgetInfoText, + GDI_CALLBACK_ACTION, HandleTextAreaGadgets, + GDI_END); + + if (gi == NULL) + Error(ERR_EXIT, "cannot create gadget"); + + level_editor_gadget[id] = gi; + } +} + +static void CreateSelectboxGadgets() +{ + int max_infotext_len = getMaxInfoTextLength(); + int i, j; + + for (i=0; i' operation will + implicitely cast -1 to an unsigned integer value!) */ + selectbox_info[i].size = 0; + + for (j=0; selectbox_info[i].options[j].text != NULL; j++) + if (strlen(selectbox_info[i].options[j].text) > selectbox_info[i].size) + selectbox_info[i].size = strlen(selectbox_info[i].options[j].text); + + selectbox_info[i].size++; /* add one character empty space */ + } + + event_mask = GD_EVENT_RELEASED | + GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING; gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS; gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS; - /* determine horizontal offset for leading selectbox text */ - if (selectbox_info[i].text != NULL) - xoffset = (getFontWidth(FONT_TEXT_1) * strlen(selectbox_info[i].text) + - 2 * ED_GADGET_DISTANCE); + /* determine horizontal position to the right of specified gadget */ + if (selectbox_info[i].gadget_id_align != GADGET_ID_NONE) + x = (right_gadget_border[selectbox_info[i].gadget_id_align] + + ED_GADGET_TEXT_DISTANCE); + + /* determine horizontal offset for leading text */ + if (selectbox_info[i].text_left != NULL) + x += getTextWidthForGadget(selectbox_info[i].text_left); sprintf(infotext, "Select %s", selectbox_info[i].infotext); infotext[max_infotext_len] = '\0'; @@ -2573,18 +3723,17 @@ static void CreateSelectboxGadgets() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, GDI_INFO_TEXT, infotext, - GDI_X, SX + selectbox_info[i].x + xoffset, - GDI_Y, SY + selectbox_info[i].y, + GDI_X, x, + GDI_Y, y, GDI_TYPE, GD_TYPE_SELECTBOX, GDI_SELECTBOX_OPTIONS, selectbox_info[i].options, - GDI_SELECTBOX_INDEX, selectbox_info[i].index, GDI_TEXT_SIZE, selectbox_info[i].size, GDI_TEXT_FONT, FONT_INPUT_1, GDI_TEXT_FONT_ACTIVE, FONT_INPUT_1_ACTIVE, GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y, GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y, GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE, - GDI_BORDER_SIZE_SELECTBUTTON, getFontWidth(FONT_INPUT_1), + GDI_BORDER_SIZE_SELECTBUTTON, ED_SELECTBOX_BUTTON_XSIZE, GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_INFO, HandleEditorGadgetInfoText, @@ -2595,6 +3744,8 @@ static void CreateSelectboxGadgets() Error(ERR_EXIT, "cannot create gadget"); level_editor_gadget[id] = gi; + right_gadget_border[id] = + getRightGadgetBorder(gi, selectbox_info[i].text_right); } } @@ -2603,7 +3754,7 @@ static void CreateTextbuttonGadgets() int max_infotext_len = getMaxInfoTextLength(); int i; - for (i=0; i= GADGET_ID_PROPERTIES_INFO && id <= GADGET_ID_PROPERTIES_ADVANCED) + { + gd_x1 = DOOR_GFX_PAGEX4 + ED_TEXTBUTTON_TAB_XPOS; + gd_x2 = DOOR_GFX_PAGEX3 + ED_TEXTBUTTON_TAB_XPOS; + gd_y1 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_TAB_YPOS; + gd_y2 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_TAB_INACTIVE_YPOS; + } + else + { + gd_x1 = DOOR_GFX_PAGEX4 + ED_TEXTBUTTON_XPOS; + gd_x2 = DOOR_GFX_PAGEX3 + ED_TEXTBUTTON_XPOS; + gd_y1 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_YPOS; + gd_y2 = DOOR_GFX_PAGEY1 + ED_TEXTBUTTON_INACTIVE_YPOS; + } sprintf(infotext, "%s", textbutton_info[i].infotext); infotext[max_infotext_len] = '\0'; + /* determine horizontal position to the right of specified gadget */ + if (textbutton_info[i].gadget_id_align != GADGET_ID_NONE) + x = (right_gadget_border[textbutton_info[i].gadget_id_align] + + ED_GADGET_TEXT_DISTANCE); + + /* determine horizontal offset for leading text */ + if (textbutton_info[i].text_left != NULL) + x += getTextWidthForGadget(textbutton_info[i].text_left); + gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, GDI_INFO_TEXT, infotext, - GDI_X, SX + textbutton_info[i].x, - GDI_Y, SY + textbutton_info[i].y, + GDI_X, x, + GDI_Y, y, GDI_TYPE, GD_TYPE_TEXT_BUTTON, - GDI_TEXT_VALUE, textbutton_info[i].value, + GDI_TEXT_VALUE, textbutton_info[i].text, GDI_TEXT_SIZE, textbutton_info[i].size, GDI_TEXT_FONT, FONT_INPUT_2_ACTIVE, GDI_TEXT_FONT_ACTIVE, FONT_INPUT_2, GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1, GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y1, GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y2, - GDI_BORDER_SIZE, ED_BORDER2_SIZE, ED_BORDER_SIZE, + GDI_BORDER_SIZE, ED_BORDER_TEXT_XSIZE, ED_BORDER_SIZE, GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE, GDI_DECORATION_SHIFTING, 1, 1, GDI_EVENT_MASK, event_mask, @@ -2647,6 +3822,64 @@ static void CreateTextbuttonGadgets() Error(ERR_EXIT, "cannot create gadget"); level_editor_gadget[id] = gi; + right_gadget_border[id] = + getRightGadgetBorder(gi, textbutton_info[i].text_right); + } +} + +static void CreateGraphicbuttonGadgets() +{ + Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; + struct GadgetInfo *gi; + unsigned long event_mask; + int i; + + /* create buttons for scrolling of drawing area and element list */ + for (i=0; i < ED_NUM_GRAPHICBUTTONS; i++) + { + int id = graphicbutton_info[i].gadget_id; + int gd_x1, gd_x2, gd_y1, gd_y2; + int x = SX + graphicbutton_info[i].x; + int y = SY + graphicbutton_info[i].y; + + event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED; + + gd_x1 = DOOR_GFX_PAGEX4 + graphicbutton_info[i].gd_x; + gd_x2 = DOOR_GFX_PAGEX3 + graphicbutton_info[i].gd_x; + gd_y1 = DOOR_GFX_PAGEY1 + graphicbutton_info[i].gd_y; + gd_y2 = gd_y1; + + /* determine horizontal position to the right of specified gadget */ + if (graphicbutton_info[i].gadget_id_align != GADGET_ID_NONE) + x = (right_gadget_border[graphicbutton_info[i].gadget_id_align] + + ED_GADGET_TEXT_DISTANCE); + + /* determine horizontal offset for leading text */ + if (graphicbutton_info[i].text_left != NULL) + x += getTextWidthForGadget(graphicbutton_info[i].text_left); + + gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_CUSTOM_TYPE_ID, i, + GDI_INFO_TEXT, graphicbutton_info[i].infotext, + GDI_X, x, + GDI_Y, y, + GDI_WIDTH, graphicbutton_info[i].width, + GDI_HEIGHT, graphicbutton_info[i].height, + GDI_TYPE, GD_TYPE_NORMAL_BUTTON, + GDI_STATE, GD_BUTTON_UNPRESSED, + GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1, + GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2, + GDI_EVENT_MASK, event_mask, + GDI_CALLBACK_INFO, HandleEditorGadgetInfoText, + GDI_CALLBACK_ACTION, HandleGraphicbuttonGadgets, + GDI_END); + + if (gi == NULL) + Error(ERR_EXIT, "cannot create gadget"); + + level_editor_gadget[id] = gi; + right_gadget_border[id] = + getRightGadgetBorder(gi, graphicbutton_info[i].text_right); } } @@ -2667,7 +3900,7 @@ static void CreateScrollbarGadgets() { items_max = num_editor_elements / ED_ELEMENTLIST_BUTTONS_HORIZ; items_visible = ED_ELEMENTLIST_BUTTONS_VERT; - item_position = 0; + item_position = element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ; } else /* drawing area scrollbars */ { @@ -2687,11 +3920,11 @@ static void CreateScrollbarGadgets() event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS; - gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].xpos; + gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].gd_x; gd_x2 = (gd_x1 - (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL ? scrollbar_info[i].height : scrollbar_info[i].width)); - gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos; - gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos; + gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].gd_y; + gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].gd_y; gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, @@ -2726,7 +3959,6 @@ static void CreateCheckbuttonGadgets() struct GadgetInfo *gi; unsigned long event_mask; int gd_x1, gd_x2, gd_x3, gd_x4, gd_y; - boolean checked; int i; event_mask = GD_EVENT_PRESSED; @@ -2737,69 +3969,112 @@ static void CreateCheckbuttonGadgets() gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS; gd_y = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS; - for (i=0; ix - xoffset_left; + 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; +#endif + + if (counterbutton_info[id].text_above) + DrawText(x, y_above, counterbutton_info[id].text_above, FONT_TEXT_1); + + if (counterbutton_info[id].text_left) + DrawText(x_left, y, counterbutton_info[id].text_left, FONT_TEXT_1); + + if (counterbutton_info[id].text_right) + DrawText(x_right, y, counterbutton_info[id].text_right, FONT_TEXT_1); + + ModifyEditorCounter(id, *counterbutton_info[id].value); + MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]); MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]); MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]); @@ -2860,38 +4174,183 @@ static void MapControlButtons() ModifyEditorCounterLimits(counter_id, leveldir_current->first_level, leveldir_current->last_level); - ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value); MapCounterButtons(counter_id); } static void MapDrawingArea(int id) { - MapGadget(level_editor_gadget[id]); + struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; + int area_xsize = gi->drawing.area_xsize; + int area_ysize = gi->drawing.area_ysize; + int xoffset_left= getTextWidthForDrawingArea(drawingarea_info[id].text_left); + int xoffset_below= getTextWidth(drawingarea_info[id].text_below,FONT_TEXT_1); + int x_left = gi->x - xoffset_left; + int x_right = gi->x + gi->width + ED_DRAWINGAREA_TEXT_DISTANCE; + int x_below = gi->x + (gi->width - xoffset_below) / 2; + int y_side = gi->y + (gi->height - getFontHeight(FONT_TEXT_1)) / 2; + int y_below = gi->y + gi->height + ED_DRAWINGAREA_TEXT_DISTANCE; + + if (drawingarea_info[id].text_left) + DrawText(x_left, y_side, drawingarea_info[id].text_left, FONT_TEXT_1); + + if (drawingarea_info[id].text_right) + DrawText(x_right, y_side, drawingarea_info[id].text_right, FONT_TEXT_1); + + if (drawingarea_info[id].text_below) + DrawText(x_below, y_below, drawingarea_info[id].text_below, FONT_TEXT_1); + + if (id != ED_DRAWING_ID_DRAWING_LEVEL) + { + DrawElementBorder(gi->x, gi->y, + area_xsize * MINI_TILEX, area_ysize * MINI_TILEY, TRUE); + + DrawDrawingArea(id); + } + + MapGadget(gi); } static void MapTextInputGadget(int id) { - MapGadget(level_editor_gadget[textinput_info[id].gadget_id]); + struct GadgetInfo *gi = level_editor_gadget[textinput_info[id].gadget_id]; + int xoffset_above = 0; + int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE); + int x_above = textinput_info[id].x + xoffset_above; + int y_above = textinput_info[id].y + yoffset_above; + + if (textinput_info[id].text_above) + DrawTextF(x_above, y_above, FONT_TEXT_1, textinput_info[id].text_above); + + ModifyGadget(gi, GDI_TEXT_VALUE, textinput_info[id].value, GDI_END); + + MapGadget(gi); +} + +static void MapTextAreaGadget(int id) +{ + struct GadgetInfo *gi = level_editor_gadget[textarea_info[id].gadget_id]; + int xoffset_above = 0; + int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE); + int x_above = textarea_info[id].x + xoffset_above; + int y_above = textarea_info[id].y + yoffset_above; + + if (textarea_info[id].text_above) + DrawTextF(x_above, y_above, FONT_TEXT_1, textarea_info[id].text_above); + + ModifyGadget(gi, GDI_TEXT_VALUE, textarea_info[id].value, GDI_END); + + MapGadget(gi); } static void MapSelectboxGadget(int id) { - MapGadget(level_editor_gadget[selectbox_info[id].gadget_id]); + struct GadgetInfo *gi = level_editor_gadget[selectbox_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(selectbox_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; + 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; + + if (selectbox_info[id].text_left) + DrawText(x_left, y, selectbox_info[id].text_left, FONT_TEXT_1); + + if (selectbox_info[id].text_right) + DrawText(x_right, y, selectbox_info[id].text_right, FONT_TEXT_1); + + ModifyEditorSelectbox(id, *selectbox_info[id].value); + + MapGadget(gi); } static void MapTextbuttonGadget(int id) { - MapGadget(level_editor_gadget[textbutton_info[id].gadget_id]); + struct GadgetInfo *gi = level_editor_gadget[textbutton_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(textbutton_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; + 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; + + /* only show button to delete change pages when more than minimum pages */ + if (id == ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE && + custom_element.num_change_pages == MIN_CHANGE_PAGES) + return; + + if (textbutton_info[id].text_left) + DrawText(x_left, y, textbutton_info[id].text_left, FONT_TEXT_1); + + if (textbutton_info[id].text_right) + DrawText(x_right, y, textbutton_info[id].text_right, FONT_TEXT_1); + + MapGadget(gi); +} + +static void MapGraphicbuttonGadget(int id) +{ + struct GadgetInfo *gi= level_editor_gadget[graphicbutton_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(graphicbutton_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; + 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; + + if (graphicbutton_info[id].text_left) + DrawText(x_left, y, graphicbutton_info[id].text_left, FONT_TEXT_1); + + if (graphicbutton_info[id].text_right) + DrawText(x_right, y, graphicbutton_info[id].text_right, FONT_TEXT_1); + + MapGadget(gi); } static void MapRadiobuttonGadget(int id) { - MapGadget(level_editor_gadget[radiobutton_info[id].gadget_id]); + struct GadgetInfo *gi = level_editor_gadget[radiobutton_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(checkbutton_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; + 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; + boolean checked = + (*radiobutton_info[id].value == radiobutton_info[id].checked_value); + + if (radiobutton_info[id].text_left) + DrawText(x_left, y, radiobutton_info[id].text_left, FONT_TEXT_1); + + if (radiobutton_info[id].text_right) + DrawText(x_right, y, radiobutton_info[id].text_right, FONT_TEXT_1); + + ModifyGadget(gi, GDI_CHECKED, checked, GDI_END); + + MapGadget(gi); } static void MapCheckbuttonGadget(int id) { - MapGadget(level_editor_gadget[checkbutton_info[id].gadget_id]); + struct GadgetInfo *gi = level_editor_gadget[checkbutton_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(checkbutton_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; + 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; + + /* 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) + DrawText(x_left, y, checkbutton_info[id].text_left, FONT_TEXT_1); + + if (checkbutton_info[id].text_right) + DrawText(x_right, y, checkbutton_info[id].text_right, FONT_TEXT_1); + + MapGadget(gi); } static void MapMainDrawingArea() @@ -2922,7 +4381,7 @@ static void MapMainDrawingArea() MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]); } - MapDrawingArea(GADGET_ID_DRAWING_LEVEL); + MapDrawingArea(ED_DRAWING_ID_DRAWING_LEVEL); } static void UnmapDrawingArea(int id) @@ -2956,6 +4415,9 @@ static void ResetUndoBuffer() static void DrawEditModeWindow() { + ModifyEditorElementList(); + RedrawDrawingElements(); + if (edit_mode == ED_MODE_INFO) DrawLevelInfoWindow(); else if (edit_mode == ED_MODE_PROPERTIES) @@ -2971,7 +4433,7 @@ static boolean LevelChanged() for(y=0; ytext.number_value; + *counter_value = gi->textinput.number_value; } static void ModifyEditorCounterLimits(int counter_id, int min, int max) @@ -3256,15 +4933,7 @@ static void ModifyEditorSelectbox(int selectbox_id, int new_value) { int gadget_id = selectbox_info[selectbox_id].gadget_id; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - int new_index_value = 0; - int i; - - for(i=0; selectbox_info[selectbox_id].options[i].text != NULL; i++) - if (selectbox_info[selectbox_id].options[i].value == new_value) - new_index_value = i; - - *selectbox_info[selectbox_id].value = - selectbox_info[selectbox_id].options[new_index_value].value; + int new_index_value = setSelectboxValue(selectbox_id, new_value); ModifyGadget(gi, GDI_SELECTBOX_INDEX, new_index_value, GDI_END); } @@ -3317,8 +4986,17 @@ static void PickDrawingElement(int button, int element) redraw_mask |= REDRAW_DOOR_1; } +static void RedrawDrawingElements() +{ + PickDrawingElement(1, new_element1); + PickDrawingElement(2, new_element2); + PickDrawingElement(3, new_element3); +} + static void DrawDrawingWindow() { + stick_element_properties_window = FALSE; + SetMainBackgroundImage(IMG_UNDEFINED); ClearWindow(); UnmapLevelEditorWindowGadgets(); @@ -3332,54 +5010,11 @@ static void DrawDrawingWindow() MapMainDrawingArea(); } -static void DrawElementBorder(int dest_x, int dest_y, int width, int height, - boolean input) -{ - int border_graphic = - (input ? IMG_EDITOR_ELEMENT_BORDER_INPUT : IMG_EDITOR_ELEMENT_BORDER); - Bitmap *src_bitmap; - int src_x, src_y; - int num_mini_tilex = width / MINI_TILEX + 1; - int num_mini_tiley = width / MINI_TILEY + 1; - int x, y; - - getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y); - - for (y=0; y < num_mini_tiley; y++) - for (x=0; x < num_mini_tilex; x++) - BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY, - dest_x - MINI_TILEX / 2 + x * MINI_TILEX, - dest_y - MINI_TILEY / 2 + y * MINI_TILEY); - - ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2); -} - -static void DrawRandomPlacementBackgroundArea() -{ - int area_x = ED_AREA_RANDOM_BACKGROUND_XPOS / MINI_TILEX; - int area_y = ED_AREA_RANDOM_BACKGROUND_YPOS / MINI_TILEY; - int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS; - int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS; - - ElementContent[0][0][0] = random_placement_background_element; - - DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE); - DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); - - MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND); -} - static void DrawLevelInfoWindow() { - char infotext[MAX_OUTPUT_LINESIZE + 1]; - int max_infotext_len = getMaxInfoTextLength(); - int xoffset_above = 0; - int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE); - int xoffset_right = getCounterGadgetWidth(); - int yoffset_right = ED_BORDER_SIZE; - int xoffset_right2 = ED_SETTINGS_XOFFSET; - int yoffset_right2 = ED_BORDER_SIZE; - int i, x, y; + int i; + + stick_element_properties_window = FALSE; SetMainBackgroundImage(IMG_BACKGROUND_EDITOR); ClearWindow(); @@ -3392,239 +5027,105 @@ static void DrawLevelInfoWindow() /* draw counter gadgets */ for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++) - { - if (counterbutton_info[i].infotext_above) - { - x = counterbutton_info[i].x + xoffset_above; - y = counterbutton_info[i].y + yoffset_above; - - sprintf(infotext, "%s:", counterbutton_info[i].infotext_above); - infotext[max_infotext_len] = '\0'; - DrawTextF(x, y, FONT_TEXT_1, infotext); - } - - if (counterbutton_info[i].infotext_right) - { - x = counterbutton_info[i].x + xoffset_right; - y = counterbutton_info[i].y + yoffset_right; - - sprintf(infotext, "%s", counterbutton_info[i].infotext_right); - infotext[max_infotext_len] = '\0'; - DrawTextF(x, y, FONT_TEXT_1, infotext); - } - - ModifyEditorCounter(i, *counterbutton_info[i].value); MapCounterButtons(i); - } - - /* draw text input gadgets */ - for (i=ED_TEXTINPUT_ID_LEVEL_FIRST; i<=ED_TEXTINPUT_ID_LEVEL_LAST; i++) - { - x = textinput_info[i].x + xoffset_above; - y = textinput_info[i].y + yoffset_above; - - sprintf(infotext, "%s:", textinput_info[i].infotext); - infotext[max_infotext_len] = '\0'; - DrawTextF(x, y, FONT_TEXT_1, infotext); - ModifyEditorTextInput(i, textinput_info[i].value); - MapTextInputGadget(i); - } + /* draw checkbutton gadgets */ + for (i=ED_CHECKBUTTON_ID_LEVEL_FIRST; i<=ED_CHECKBUTTON_ID_LEVEL_LAST; i++) + MapCheckbuttonGadget(i); /* draw radiobutton gadgets */ for (i=ED_RADIOBUTTON_ID_LEVEL_FIRST; i<=ED_RADIOBUTTON_ID_LEVEL_LAST; i++) - { - boolean checked = - (*radiobutton_info[i].value == radiobutton_info[i].checked_value); - - x = radiobutton_info[i].x + xoffset_right2; - y = radiobutton_info[i].y + yoffset_right2; - - DrawTextF(x, y, FONT_TEXT_1, radiobutton_info[i].text); - ModifyGadget(level_editor_gadget[radiobutton_info[i].gadget_id], - GDI_CHECKED, checked, GDI_END); MapRadiobuttonGadget(i); - } - - /* draw checkbutton gadgets */ - for (i=ED_CHECKBUTTON_ID_LEVEL_FIRST; i<=ED_CHECKBUTTON_ID_LEVEL_LAST; i++) - { - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, GDI_END); - MapCheckbuttonGadget(i); - } + /* draw text input gadgets */ + for (i=ED_TEXTINPUT_ID_LEVEL_FIRST; i<=ED_TEXTINPUT_ID_LEVEL_LAST; i++) + MapTextInputGadget(i); /* draw drawing area */ - DrawRandomPlacementBackgroundArea(); + MapDrawingArea(ED_DRAWING_ID_RANDOM_BACKGROUND); } -static void DrawAmoebaContentArea() +static void DrawCustomContentArea() { - int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX; - int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY; - int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS; - int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS; + int id = ED_DRAWING_ID_CUSTOM_CONTENT; + struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; + int x1 = right_gadget_border[GADGET_ID_CUSTOM_DEADLINESS]; + int x2 = right_gadget_border[GADGET_ID_CUSTOM_CONSISTENCY]; + int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT]; + int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; - ElementContent[0][0][0] = level.amoeba_content; - - DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE); - DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); - - DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1); - - MapDrawingArea(GADGET_ID_AMOEBA_CONTENT); -} - -static void DrawCustomGraphicElementArea() -{ - struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_GRAPHIC]; -#if 0 - int xoffset_right2 = ED_SETTINGS_XOFFSET; - int yoffset_right2 = ED_BORDER_SIZE; - int i = ED_CHECKBUTTON_ID_CUSTOM_GRAPHIC; - int text_len = strlen(checkbutton_info[i].text); - int text_width = text_len * getFontWidth(FONT_TEXT_1); - int xpos = checkbutton_info[i].x + 2 * xoffset_right2 + text_width; - int ypos = checkbutton_info[i].y + yoffset_right2; -#else - int xpos = ED_AREA_ELEM_CONTENT3_XPOS; - int ypos = ED_AREA_ELEM_CONTENT3_YPOS; -#endif - int area_sx = SX + xpos; - int area_sy = SY + ypos; - - if (!IS_CUSTOM_ELEMENT(properties_element)) - { - /* this should never happen */ - Error(ERR_WARN, "element %d is no custom element", properties_element); - - return; - } - - ElementContent[0][0][0] = custom_element.gfx_element; - - DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE); -#if 1 - DrawMiniGraphicExt(drawto, - gi->x, - gi->y, - el2edimg(ElementContent[0][0][0])); -#else - DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); -#endif + /* add distance for potential left text (without drawing area border) */ + x2 += getTextWidthForGadget(drawingarea_info[id].text_left); -#if 0 - DrawText(area_sx + TILEX, area_sy + 1, "Element after change", FONT_TEXT_1); -#endif + ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END); - MapDrawingArea(GADGET_ID_CUSTOM_GRAPHIC); + MapDrawingArea(ED_DRAWING_ID_CUSTOM_CONTENT); } -static void DrawCustomChangedArea() +static void DrawCustomChangeContentArea() { - struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGED]; -#if 0 - int xoffset_right2 = ED_SETTINGS_XOFFSET; - int yoffset_right2 = ED_BORDER_SIZE; - int i = ED_CHECKBUTTON_ID_CUSTOM_CHANGEABLE; - int text_len = strlen(checkbutton_info[i].text); - int text_width = text_len * getFontWidth(FONT_TEXT_1); - int xpos = checkbutton_info[i].x + 2 * xoffset_right2 + text_width; - int ypos = checkbutton_info[i].y + yoffset_right2; -#else - int xpos = ED_AREA_ELEM_CONTENT2_XPOS; - int ypos = ED_AREA_ELEM_CONTENT2_YPOS; -#endif - int area_sx = SX + xpos; - int area_sy = SY + ypos; + 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 x3 = right_gadget_border[GADGET_ID_CHANGE_ONLY_COMPLETE]; + int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; - if (!IS_CUSTOM_ELEMENT(properties_element)) - { - /* this should never happen */ - Error(ERR_WARN, "element %d is no custom element", properties_element); + ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END); - return; - } - - ElementContent[0][0][0] = custom_element.change.successor; - - DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE); -#if 1 - DrawMiniGraphicExt(drawto, - gi->x, - gi->y, - el2edimg(ElementContent[0][0][0])); -#else - DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); -#endif - -#if 0 - DrawText(area_sx + TILEX, area_sy + 1, "Element after change", FONT_TEXT_1); -#endif - - MapDrawingArea(GADGET_ID_CUSTOM_CHANGED); + MapDrawingArea(id); } static void DrawElementContentAreas() { - int counter_id = ED_COUNTER_ID_ELEMENT_CONTENT; - int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX; - int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY; - int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS; - int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS; - int xoffset_right = getCounterGadgetWidth(); - int yoffset_right = ED_BORDER_SIZE; - int i, x, y; - - for (i=0; ix, gi->y, gi->width, gi->height); - for (i=0; iy + gd_gi->height - 1; Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y); int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO; - int id_last = ED_TEXTBUTTON_ID_PROPERTIES_INFO; + int id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG; int i; - /* draw additional "configure" tabulator for configurable elements */ - if (checkPropertiesConfig()) - id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG; - /* draw additional "advanced" tabulator for custom elements */ if (IS_CUSTOM_ELEMENT(properties_element)) id_last = ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED; @@ -3857,15 +5354,7 @@ static void DrawPropertiesInfo() properties[] = { /* configurable properties */ - { EP_INDESTRUCTIBLE, "- undestructible" }, - { EP_DIGGABLE, "- diggable" }, - { EP_COLLECTIBLE, "- collectible" }, - { EP_PUSHABLE, "- pushable" }, - { EP_CAN_FALL, "- can fall" }, - { EP_CAN_SMASH, "- can smash other objects" }, - { EP_CAN_MOVE, "- can move" }, - { EP_SLIPPERY, "- slippery for falling objects" }, - { EP_EM_SLIPPERY_WALL, "- slippery for some gems (EM style)" }, + { EP_WALKABLE_OVER, "- player can walk over it" }, { EP_WALKABLE_INSIDE, "- player can walk inside it" }, { EP_WALKABLE_UNDER, "- player can walk under it" }, @@ -3873,12 +5362,37 @@ static void DrawPropertiesInfo() { EP_PASSABLE_INSIDE, "- player can pass through it" }, { EP_PASSABLE_UNDER, "- player can pass under it" }, + { EP_DIGGABLE, "- can be digged away" }, + { EP_COLLECTIBLE, "- can be collected" }, + { EP_DROPPABLE, "- can be dropped after collecting" }, + { EP_PUSHABLE, "- can be pushed" }, + + { EP_CAN_MOVE, "- can move" }, + { EP_CAN_FALL, "- can fall" }, + + { EP_CAN_SMASH_PLAYER, "- can smash player" }, +#if 0 + { EP_CAN_SMASH_ENEMIES, "- can smash good and bad guys" }, +#endif + { EP_CAN_SMASH_EVERYTHING, "- can smash everything smashable" }, + + { EP_SLIPPERY, "- slippery for falling objects" }, + { EP_EM_SLIPPERY_WALL, "- slippery for some gems (EM style)" }, + + { EP_DONT_RUN_INTO, "- deadly when running into" }, + { EP_DONT_COLLIDE_WITH, "- deadly when colliding with" }, + { EP_DONT_TOUCH, "- deadly when touching" }, + + { EP_INDESTRUCTIBLE, "- indestructible" }, + + { EP_CAN_EXPLODE_BY_FIRE, "- can explode by fire or explosions" }, + { EP_CAN_EXPLODE_SMASHED, "- can explode when smashed" }, + { EP_CAN_EXPLODE_IMPACT, "- can explode on impact" }, + + { EP_CAN_CHANGE, "- can change to other element" }, + /* pre-defined properties */ { EP_CAN_PASS_MAGIC_WALL, "- can pass magic walls" }, - { EP_DONT_TOUCH, "- deadly when touched" }, - { EP_ENEMY, "- can kill the player" }, - { EP_DONT_GO_TO, "- deadly when walked to" }, - { EP_CAN_EXPLODE, "- can explode" }, { EP_HAS_CONTENT, "- can contain other elements" }, { -1, NULL } @@ -3894,7 +5408,7 @@ static void DrawPropertiesInfo() int font1_width = getFontWidth(font1_nr); int font2_height = getFontHeight(font2_nr); int pad_x = ED_SETTINGS_XPOS(0); - int pad_y = ED_SETTINGS_YPOS(0); + int pad_y = ED_SETTINGS_YPOS(0) + ED_BORDER_SIZE; int screen_line = 0; int i, x, y; @@ -3961,7 +5475,10 @@ static struct { EL_EMERALD_YELLOW, &level.score[SC_EMERALD], TEXT_COLLECTING }, { EL_EMERALD_RED, &level.score[SC_EMERALD], TEXT_COLLECTING }, { EL_EMERALD_PURPLE, &level.score[SC_EMERALD], TEXT_COLLECTING }, + { EL_SP_INFOTRON, &level.score[SC_EMERALD], TEXT_COLLECTING }, { 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_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 }, @@ -3970,6 +5487,7 @@ static struct { 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_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 }, @@ -3978,6 +5496,7 @@ static struct { EL_BD_FIREFLY_UP, &level.score[SC_SPACESHIP], TEXT_SMASHING }, { EL_BD_FIREFLY_LEFT, &level.score[SC_SPACESHIP], TEXT_SMASHING }, { EL_BD_FIREFLY_DOWN, &level.score[SC_SPACESHIP], TEXT_SMASHING }, + { EL_SP_SNIKSNAK, &level.score[SC_SPACESHIP], TEXT_SMASHING }, { 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 }, @@ -3987,14 +5506,27 @@ 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_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 }, + { EL_SHIELD_NORMAL, &level.score[SC_SHIELD], TEXT_COLLECTING }, + { EL_SHIELD_DEADLY, &level.score[SC_SHIELD], TEXT_COLLECTING }, + { EL_EXTRA_TIME, &level.score[SC_TIME_BONUS], TEXT_COLLECTING }, { EL_KEY_1, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_KEY_2, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_KEY_3, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_KEY_4, &level.score[SC_KEY], TEXT_COLLECTING }, +#if 1 + { EL_EM_KEY_1, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_2, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_3, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_4, &level.score[SC_KEY], TEXT_COLLECTING }, +#else { EL_EM_KEY_1_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_EM_KEY_2_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_EM_KEY_3_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_EM_KEY_4_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, +#endif { EL_AMOEBA_WET, &level.amoeba_speed, TEXT_SPEED }, { EL_AMOEBA_DRY, &level.amoeba_speed, TEXT_SPEED }, { EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_SPEED }, @@ -4010,6 +5542,7 @@ static boolean checkPropertiesConfig() if (IS_GEM(properties_element) || IS_CUSTOM_ELEMENT(properties_element) || + IS_ENVELOPE(properties_element) || HAS_CONTENT(properties_element)) return TRUE; else @@ -4022,192 +5555,179 @@ static boolean checkPropertiesConfig() static void DrawPropertiesConfig() { - boolean element_has_score = FALSE; - char *element_score_text = NULL; - static int temporary_dummy_score = 0; - int counter_id = ED_COUNTER_ID_ELEMENT_SCORE; - int xoffset_right = getCounterGadgetWidth(); - int yoffset_right = ED_BORDER_SIZE; - int xoffset_right2 = ED_SETTINGS_XOFFSET; - int yoffset_right2 = ED_BORDER_SIZE; - int i, x, y; + int i; + + if (!checkPropertiesConfig()) + { + PrintInfoText("No configuration options available.", FONT_TEXT_1, 0); + + return; + } /* check if there are elements where a score can be chosen for */ for (i=0; elements_with_counter[i].element != -1; i++) { if (elements_with_counter[i].element == properties_element) { -#if 1 - counterbutton_info[counter_id].value = elements_with_counter[i].value; - element_score_text = elements_with_counter[i].text; - element_has_score = TRUE; -#else - int x = counterbutton_info[counter_id].x + xoffset_right; - int y = counterbutton_info[counter_id].y + yoffset_right; + int counter_id = ED_COUNTER_ID_ELEMENT_SCORE; counterbutton_info[counter_id].value = elements_with_counter[i].value; - DrawTextF(x, y, FONT_TEXT_1, elements_with_counter[i].text); - - ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value); + counterbutton_info[counter_id].text_right= elements_with_counter[i].text; MapCounterButtons(counter_id); -#endif + break; } } - if (IS_CUSTOM_ELEMENT(properties_element)) - { - counterbutton_info[counter_id].value = &temporary_dummy_score; - element_score_text = "Score for certain actions"; - element_has_score = TRUE; - } - - if (element_has_score) - { - int x = counterbutton_info[counter_id].x + xoffset_right; - int y = counterbutton_info[counter_id].y + yoffset_right; - - DrawTextF(x, y, FONT_TEXT_1, element_score_text); - - ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value); - MapCounterButtons(counter_id); - } - - if (HAS_CONTENT(properties_element) || - IS_CUSTOM_ELEMENT(properties_element)) + if (HAS_CONTENT(properties_element)) { /* draw stickybutton gadget */ i = ED_CHECKBUTTON_ID_STICK_ELEMENT; - if (HAS_CONTENT(properties_element)) - checkbutton_info[i].y = ED_COUNTER_YPOS(4); - else - checkbutton_info[i].y = ED_SETTINGS_YPOS(1); - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; - - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, - GDI_Y, SY + checkbutton_info[i].y, GDI_END); + checkbutton_info[i].y = ED_COUNTER_YPOS(4); MapCheckbuttonGadget(i); - if (IS_CUSTOM_ELEMENT(properties_element)) - DrawCustomGraphicElementArea(); - else if (IS_AMOEBOID(properties_element)) - DrawAmoebaContentArea(); + if (IS_AMOEBOID(properties_element)) + MapDrawingArea(ED_DRAWING_ID_AMOEBA_CONTENT); else DrawElementContentAreas(); } if (IS_GEM(properties_element)) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS); + + if (IS_ENVELOPE(properties_element)) { - /* draw checkbutton gadget */ - i = ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS; - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; + int counter1_id = ED_COUNTER_ID_ENVELOPE_XSIZE; + int counter2_id = ED_COUNTER_ID_ENVELOPE_YSIZE; + int envelope_nr = properties_element - EL_ENVELOPE_1; - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, GDI_END); - MapCheckbuttonGadget(i); + counterbutton_info[counter1_id].value = &level.envelope_xsize[envelope_nr]; + counterbutton_info[counter2_id].value = &level.envelope_ysize[envelope_nr]; + + /* display counter to choose size of envelope text area */ + MapCounterButtons(ED_COUNTER_ID_ENVELOPE_XSIZE); + MapCounterButtons(ED_COUNTER_ID_ENVELOPE_YSIZE); + + DrawEnvelopeTextArea(envelope_nr); } if (IS_CUSTOM_ELEMENT(properties_element)) { + /* draw stickybutton gadget */ + i = ED_CHECKBUTTON_ID_STICK_ELEMENT; + checkbutton_info[i].y = ED_SETTINGS_YPOS(0); + MapCheckbuttonGadget(i); + /* draw checkbutton gadgets */ for (i = ED_CHECKBUTTON_ID_CUSTOM_FIRST; i <= ED_CHECKBUTTON_ID_CUSTOM_LAST; i++) - { - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; - - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, GDI_END); MapCheckbuttonGadget(i); - } + + /* draw counter gadgets */ + for (i=ED_COUNTER_ID_CUSTOM_FIRST; i<=ED_COUNTER_ID_CUSTOM_LAST; i++) + MapCounterButtons(i); /* draw selectbox gadgets */ for (i=ED_SELECTBOX_ID_CUSTOM_FIRST; i <= ED_SELECTBOX_ID_CUSTOM_LAST; i++) - { - int yoffset = ED_BORDER_SIZE; + MapSelectboxGadget(i); - x = selectbox_info[i].x; - y = selectbox_info[i].y + yoffset; + /* draw drawing area gadgets */ + DrawCustomContentArea(); - DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text); - ModifyEditorSelectbox(i, *selectbox_info[i].value); - MapSelectboxGadget(i); - } + /* draw text input gadgets */ + MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME); } } +static void DrawPropertiesAdvancedDrawingAreas() +{ + MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC); + MapDrawingArea(ED_DRAWING_ID_CUSTOM_CHANGE_TARGET); + MapDrawingArea(ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER); + + DrawCustomChangeContentArea(); + + redraw_mask |= REDRAW_FIELD; +} + static void DrawPropertiesAdvanced() { - char infotext[MAX_OUTPUT_LINESIZE + 1]; - int max_infotext_len = getMaxInfoTextLength(); - int xoffset_right = getCounterGadgetWidth(); - int yoffset_right = ED_BORDER_SIZE; - int xoffset_right2 = ED_SETTINGS_XOFFSET; - int yoffset_right2 = ED_BORDER_SIZE; - int i, x, y; + int i; /* draw stickybutton gadget */ i = ED_CHECKBUTTON_ID_STICK_ELEMENT; checkbutton_info[i].y = ED_SETTINGS_YPOS(0); - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; - - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, - GDI_Y, SY + checkbutton_info[i].y, GDI_END); MapCheckbuttonGadget(i); - /* draw counter gadgets */ - for (i=ED_COUNTER_ID_CHANGE_FIRST; i<=ED_COUNTER_ID_CHANGE_LAST; i++) - { - if (counterbutton_info[i].infotext_right) - { - x = counterbutton_info[i].x + xoffset_right; - y = counterbutton_info[i].y + yoffset_right; - - sprintf(infotext, "%s", counterbutton_info[i].infotext_right); - infotext[max_infotext_len] = '\0'; - DrawTextF(x, y, FONT_TEXT_1, infotext); - } - - ModifyEditorCounter(i, *counterbutton_info[i].value); - MapCounterButtons(i); - } - /* draw checkbutton gadgets */ for (i = ED_CHECKBUTTON_ID_CHANGE_FIRST; i <= ED_CHECKBUTTON_ID_CHANGE_LAST; i++) - { - x = checkbutton_info[i].x + xoffset_right2; - y = checkbutton_info[i].y + yoffset_right2; - - DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text); - ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], - GDI_CHECKED, *checkbutton_info[i].value, GDI_END); MapCheckbuttonGadget(i); - } + + /* draw counter gadgets */ + for (i=ED_COUNTER_ID_CHANGE_FIRST; i<=ED_COUNTER_ID_CHANGE_LAST; i++) + MapCounterButtons(i); /* draw selectbox gadgets */ for (i=ED_SELECTBOX_ID_CHANGE_FIRST; i<=ED_SELECTBOX_ID_CHANGE_LAST; i++) + MapSelectboxGadget(i); + + /* draw textbutton gadgets */ + for (i=ED_TEXTBUTTON_ID_CHANGE_FIRST; i<=ED_TEXTBUTTON_ID_CHANGE_LAST; i++) + MapTextbuttonGadget(i); + + /* draw graphicbutton gadgets */ + for (i = ED_GRAPHICBUTTON_ID_CHANGE_FIRST; + i <= ED_GRAPHICBUTTON_ID_CHANGE_LAST; i++) + MapGraphicbuttonGadget(i); + + /* draw drawing area gadgets */ + DrawPropertiesAdvancedDrawingAreas(); +} + +static void DrawElementName(int x, int y, int element) +{ + char *element_name = getElementInfoText(element); + int font_nr = FONT_TEXT_1; + int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + int max_text_width = SXSIZE - x - ED_SETTINGS_XPOS(0); + int max_chars_per_line = max_text_width / font_width; + char buffer[max_chars_per_line + 1]; + + if (strlen(element_name) <= max_chars_per_line) + DrawTextF(x, y, font_nr, element_name); + else { - int yoffset = ED_BORDER_SIZE; + int next_pos = max_chars_per_line; - x = selectbox_info[i].x; - y = selectbox_info[i].y + yoffset; + strncpy(buffer, element_name, max_chars_per_line); + buffer[max_chars_per_line] = '\0'; - DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text); - ModifyEditorSelectbox(i, *selectbox_info[i].value); - MapSelectboxGadget(i); - } + if (element_name[max_chars_per_line] == ' ') + next_pos++; + else + { + int i; + + for (i = max_chars_per_line - 1; i >= 0; i--) + if (buffer[i] == ' ') + break; + + if (strlen(&element_name[i + 1]) <= max_chars_per_line) + { + buffer[i] = '\0'; + next_pos = i + 1; + } + } + + DrawTextF(x, y - font_height / 2, font_nr, buffer); - DrawCustomChangedArea(); + strncpy(buffer, &element_name[next_pos], max_chars_per_line); + buffer[max_chars_per_line] = '\0'; + + DrawTextF(x, y + font_height / 2, font_nr, buffer); + } } static void DrawPropertiesWindow() @@ -4215,15 +5735,13 @@ static void DrawPropertiesWindow() int xstart = 2; int ystart = 4; + stick_element_properties_window = FALSE; + /* make sure that previous properties edit mode exists for this element */ if (edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED && !IS_CUSTOM_ELEMENT(properties_element)) edit_mode_properties = ED_MODE_PROPERTIES_CONFIG; - if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG && - !checkPropertiesConfig()) - edit_mode_properties = ED_MODE_PROPERTIES_INFO; - if (IS_CUSTOM_ELEMENT(properties_element)) CopyCustomElementPropertiesToEditor(properties_element); @@ -4245,8 +5763,8 @@ static void DrawPropertiesWindow() FrameCounter = 0; /* restart animation frame counter */ - DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY, - FONT_TEXT_1, getElementInfoText(properties_element)); + DrawElementName((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY, + properties_element); DrawPropertiesTabulatorGadgets(); @@ -4258,6 +5776,16 @@ static void DrawPropertiesWindow() DrawPropertiesAdvanced(); } +static void UpdateCustomElementGraphicGadgets() +{ + ModifyEditorElementList(); + RedrawDrawingElements(); + + if (edit_mode == ED_MODE_PROPERTIES && + edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED) + DrawPropertiesAdvancedDrawingAreas(); +} + static void DrawLineElement(int sx, int sy, int element, boolean change_level) { int lx = sx + level_xpos; @@ -4784,12 +6312,6 @@ static void CopyLevelToUndoBuffer(int mode) SetBorderElement(); if (BorderElement != last_border_element) DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); - -#if 0 -#ifdef DEBUG - printf("level saved to undo buffer\n"); -#endif -#endif } static void RandomPlacement(int new_element) @@ -4925,7 +6447,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) /* automatically switch to 'single item' drawing mode, if needed */ actual_drawing_function = - (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS); + (draw_level || drawing_function == GADGET_ID_PICK_ELEMENT ? + drawing_function : GADGET_ID_SINGLE_ITEMS); + + /* clicking into drawing area with pressed Control key picks element */ + if (GetKeyModState() & KMOD_Control) + actual_drawing_function = GADGET_ID_PICK_ELEMENT; switch (actual_drawing_function) { @@ -4991,28 +6518,44 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) level.amoeba_content = new_element; else if (id == GADGET_ID_CUSTOM_GRAPHIC) { - int i = properties_element - EL_CUSTOM_START; - new_element = GFX_ELEMENT(new_element); custom_element.gfx_element = new_element; - level.custom_element[i] = custom_element; - ModifyEditorElementList(); + CopyCustomElementPropertiesToGame(properties_element); + + UpdateCustomElementGraphicGadgets(); FrameCounter = 0; /* restart animation frame counter */ } - else if (id == GADGET_ID_CUSTOM_CHANGED) + else if (id == GADGET_ID_CUSTOM_CONTENT) + { + custom_element.content[sx][sy] = new_element; + + CopyCustomElementPropertiesToGame(properties_element); + } + else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) + { + custom_element_change.target_element = new_element; + + CopyCustomElementPropertiesToGame(properties_element); + } + else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) + { + custom_element_change.content[sx][sy] = new_element; + + CopyCustomElementPropertiesToGame(properties_element); + } + else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) { - int i = properties_element - EL_CUSTOM_START; + custom_element_change.trigger_element = new_element; - custom_element.change.successor = new_element; - level.custom_element[i] = custom_element; + CopyCustomElementPropertiesToGame(properties_element); } else if (id == GADGET_ID_RANDOM_BACKGROUND) random_placement_background_element = new_element; else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && id <= GADGET_ID_ELEMENT_CONTENT_7) - level.yam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy] = + level.yamyam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy] = new_element; } break; @@ -5110,8 +6653,29 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) if (button_release_event) ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFTBUTTON); - else + else if (draw_level) PickDrawingElement(button, Feld[lx][ly]); + else if (id == GADGET_ID_AMOEBA_CONTENT) + PickDrawingElement(button, level.amoeba_content); + else if (id == GADGET_ID_CUSTOM_GRAPHIC) + PickDrawingElement(button, custom_element.gfx_element); + else if (id == GADGET_ID_CUSTOM_CONTENT) + PickDrawingElement(button, custom_element.content[sx][sy]); + 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]); + else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) + PickDrawingElement(button, custom_element_change.trigger_element); + else if (id == GADGET_ID_RANDOM_BACKGROUND) + PickDrawingElement(button, random_placement_background_element); + else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && + id <= GADGET_ID_ELEMENT_CONTENT_7) + { + int i = id - GADGET_ID_ELEMENT_CONTENT_0; + + PickDrawingElement(button, level.yamyam_content[i][sx][sy]); + } break; @@ -5148,7 +6712,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi) } if (gadget_id == counterbutton_info[counter_id].gadget_id_text) - *counter_value = gi->text.number_value; + *counter_value = gi->textinput.number_value; else ModifyEditorCounter(counter_id, *counter_value + step); @@ -5158,6 +6722,11 @@ static void HandleCounterButtons(struct GadgetInfo *gi) DrawElementContentAreas(); break; + case ED_COUNTER_ID_ENVELOPE_XSIZE: + case ED_COUNTER_ID_ENVELOPE_YSIZE: + DrawEnvelopeTextArea(-1); + break; + case ED_COUNTER_ID_LEVEL_XSIZE: case ED_COUNTER_ID_LEVEL_YSIZE: lev_fieldx = level.fieldx; @@ -5175,44 +6744,125 @@ static void HandleCounterButtons(struct GadgetInfo *gi) break; } - if (counter_id >= ED_COUNTER_ID_CHANGE_FIRST && - counter_id <= ED_COUNTER_ID_CHANGE_LAST) + if ((counter_id >= ED_COUNTER_ID_CUSTOM_FIRST && + counter_id <= ED_COUNTER_ID_CUSTOM_LAST) || + (counter_id >= ED_COUNTER_ID_CHANGE_FIRST && + counter_id <= ED_COUNTER_ID_CHANGE_LAST)) CopyCustomElementPropertiesToGame(properties_element); } static void HandleTextInputGadgets(struct GadgetInfo *gi) { - strcpy(textinput_info[gi->custom_type_id].value, gi->text.value); + int type_id = gi->custom_type_id; + + strcpy(textinput_info[type_id].value, gi->textinput.value); + + if (type_id == ED_TEXTINPUT_ID_ELEMENT_NAME) + { + CopyCustomElementPropertiesToGame(properties_element); + + ModifyEditorElementList(); /* update changed button info text */ + } +} + +static void HandleTextAreaGadgets(struct GadgetInfo *gi) +{ + int type_id = gi->custom_type_id; + + strcpy(textarea_info[type_id].value, gi->textarea.value); } static void HandleSelectboxGadgets(struct GadgetInfo *gi) { int type_id = gi->custom_type_id; - *selectbox_info[type_id].index = gi->selectbox.index; *selectbox_info[type_id].value = selectbox_info[type_id].options[gi->selectbox.index].value; - if ((type_id >= ED_SELECTBOX_ID_CUSTOM_FIRST && - type_id <= ED_SELECTBOX_ID_CUSTOM_LAST) || - (type_id >= ED_SELECTBOX_ID_CHANGE_FIRST && - type_id <= ED_SELECTBOX_ID_CHANGE_LAST)) - CopyCustomElementPropertiesToGame(properties_element); + if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE) + { + element_info[properties_element].current_change_page = gi->selectbox.index; -#if 0 - printf("Selected text value: '%s' [%d]\n", - selectbox_info[type_id].options[gi->selectbox.index].text, - selectbox_info[type_id].options[gi->selectbox.index].value); -#endif + DrawPropertiesWindow(); + } + else if ((type_id >= ED_SELECTBOX_ID_CUSTOM_FIRST && + type_id <= ED_SELECTBOX_ID_CUSTOM_LAST) || + (type_id >= ED_SELECTBOX_ID_CHANGE_FIRST && + type_id <= ED_SELECTBOX_ID_CHANGE_LAST)) + CopyCustomElementPropertiesToGame(properties_element); } static void HandleTextbuttonGadgets(struct GadgetInfo *gi) { - if (gi->custom_type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO && - gi->custom_type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED) + int type_id = gi->custom_type_id; + int i; + + if (type_id >= ED_TEXTBUTTON_ID_PROPERTIES_FIRST && + type_id <= ED_TEXTBUTTON_ID_PROPERTIES_LAST) { edit_mode_properties = gi->custom_type_id; + DrawPropertiesWindow(); + } + else if (type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE) + { + boolean new_template = (!LevelFileExists(-1)); + + if (new_template || + Request("Save this tem- plate and kill the old ?", REQ_ASK)) + SaveLevelTemplate(); + + if (new_template) + Request("Tem- plate saved !", REQ_CONFIRM); + } + else if (type_id == ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE && + custom_element.num_change_pages < MAX_CHANGE_PAGES) + { + struct ElementInfo *ei = &element_info[properties_element]; + + setElementChangePages(ei, ei->num_change_pages + 1); + + /* set new change page to be new current change page */ + ei->current_change_page = ei->num_change_pages - 1; + ei->change = &ei->change_page[ei->current_change_page]; + + setElementChangeInfoToDefaults(ei->change); + + DrawPropertiesWindow(); + } + else if (type_id == ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE && + custom_element.num_change_pages > MIN_CHANGE_PAGES) + { + struct ElementInfo *ei = &element_info[properties_element]; + + /* copy all change pages after change page to be deleted */ + for (i = ei->current_change_page; i < ei->num_change_pages - 1; i++) + ei->change_page[i] = ei->change_page[i + 1]; + + setElementChangePages(ei, ei->num_change_pages - 1); + + DrawPropertiesWindow(); + } +} + +static void HandleGraphicbuttonGadgets(struct GadgetInfo *gi) +{ + int type_id = gi->custom_type_id; + + if (type_id == ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE || + type_id == ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE) + { + struct ElementInfo *ei = &element_info[properties_element]; + int step = BUTTON_STEPSIZE(gi->event.button); + + step *= (type_id == ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE ? -1 : +1); + ei->current_change_page += step; + + if (ei->current_change_page < 0) + ei->current_change_page = 0; + else if (ei->current_change_page >= ei->num_change_pages) + ei->current_change_page = ei->num_change_pages - 1; + DrawPropertiesWindow(); } } @@ -5232,11 +6882,32 @@ static void HandleCheckbuttons(struct GadgetInfo *gi) 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_CHANGE_LAST && + type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE)) + { CopyCustomElementPropertiesToGame(properties_element); + } if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC) - ModifyEditorElementList(); + { + UpdateCustomElementGraphicGadgets(); + } + else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE) + { + if (level.use_custom_template && !LevelFileExists(-1)) + { + Request("No level tem- plate found !", REQ_CONFIRM); + + level.use_custom_template = FALSE; + ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END); + + return; + } + + LoadLevelTemplate(level.use_custom_template ? -1 : level_nr); + + DrawEditModeWindow(); + } } static void HandleControlButtons(struct GadgetInfo *gi) @@ -5251,7 +6922,9 @@ static void HandleControlButtons(struct GadgetInfo *gi) DrawLevelText(0, 0, 0, TEXT_END); if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES && - edit_mode != ED_MODE_DRAWING) + id != GADGET_ID_PICK_ELEMENT && edit_mode != ED_MODE_DRAWING && + drawing_function != GADGET_ID_PICK_ELEMENT && + !(GetKeyModState() & KMOD_Control)) { DrawDrawingWindow(); edit_mode = ED_MODE_DRAWING; @@ -5426,6 +7099,12 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; } + if (edit_mode != ED_MODE_DRAWING) + { + DrawDrawingWindow(); + edit_mode = ED_MODE_DRAWING; + } + undo_buffer_position = (undo_buffer_position - 1 + NUM_UNDO_STEPS) % NUM_UNDO_STEPS; undo_buffer_steps--; @@ -5450,6 +7129,12 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; case GADGET_ID_CLEAR: + if (edit_mode != ED_MODE_DRAWING) + { + DrawDrawingWindow(); + edit_mode = ED_MODE_DRAWING; + } + for(x=0; xcustom_id == GADGET_ID_SINGLE_ITEMS) /* special case 1 */ sprintf(shortcut, " ('.' or '%c')", key); - else if (gi->custom_id == GADGET_ID_TEST) /* special case 2 */ + else if (gi->custom_id == GADGET_ID_PICK_ELEMENT) /* special case 2 */ + sprintf(shortcut, " ('%c' or 'Ctrl')", key); + else if (gi->custom_id == GADGET_ID_TEST) /* special case 3 */ sprintf(shortcut, " ('Enter' or 'Shift-%c')", key); else /* normal case */ sprintf(shortcut, " ('%s%c')", @@ -5710,6 +7400,11 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) int min_sx = 0, min_sy = 0; int max_sx = gi->drawing.area_xsize - 1; int max_sy = gi->drawing.area_ysize - 1; + int actual_drawing_function = drawing_function; + + /* pressed Control key: simulate picking element */ + if (GetKeyModState() & KMOD_Control) + actual_drawing_function = GADGET_ID_PICK_ELEMENT; ClearEditorGadgetInfoText(); @@ -5750,7 +7445,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) start_ly = ly; } - switch (drawing_function) + switch (actual_drawing_function) { case GADGET_ID_SINGLE_ITEMS: infotext = "Drawing single items"; @@ -5788,7 +7483,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) break; } - if (drawing_function == GADGET_ID_PICK_ELEMENT) + if (actual_drawing_function == GADGET_ID_PICK_ELEMENT) DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s: %d, %d", infotext, lx, ly); else @@ -5796,7 +7491,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) "%s: %d, %d", infotext, ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1); } - else if (drawing_function == GADGET_ID_PICK_ELEMENT) + else if (actual_drawing_function == GADGET_ID_PICK_ELEMENT) DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", getElementInfoText(Feld[lx][ly])); else @@ -5813,22 +7508,67 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) DeleteBrushFromCursor(); } } - else if (id == GADGET_ID_AMOEBA_CONTENT) - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, - "Amoeba content"); - else if (id == GADGET_ID_CUSTOM_GRAPHIC) - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, - "Optional custom graphic element"); - else if (id == GADGET_ID_CUSTOM_CHANGED) - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, - "New element after change"); - else if (id == GADGET_ID_RANDOM_BACKGROUND) - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, - "Random placement background"); + else if (actual_drawing_function == GADGET_ID_PICK_ELEMENT) + { + if (id == GADGET_ID_AMOEBA_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(level.amoeba_content)); + else if (id == GADGET_ID_CUSTOM_GRAPHIC) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(custom_element.gfx_element)); + else if (id == GADGET_ID_CUSTOM_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(custom_element.content[sx][sy])); + else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(custom_element_change.target_element)); + else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(custom_element_change.content[sx][sy])); + else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(custom_element_change.trigger_element)); + else if (id == GADGET_ID_RANDOM_BACKGROUND) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(random_placement_background_element)); + else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && + id <= GADGET_ID_ELEMENT_CONTENT_7) + { + int i = id - GADGET_ID_ELEMENT_CONTENT_0; + + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s", + getElementInfoText(level.yamyam_content[i][sx][sy])); + } + } else - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, - "Content area %d position: %d, %d", - id - GADGET_ID_ELEMENT_CONTENT_0 + 1, sx, sy); + { + if (id == GADGET_ID_AMOEBA_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Amoeba content"); + else if (id == GADGET_ID_CUSTOM_GRAPHIC) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Custom graphic element"); + else if (id == GADGET_ID_CUSTOM_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Custom element content position: %d, %d", sx, sy); + else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "New element after change"); + else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "New extended elements after change"); + else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Other element triggering change"); + else if (id == GADGET_ID_RANDOM_BACKGROUND) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Random placement background"); + else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && + id <= GADGET_ID_ELEMENT_CONTENT_7) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, + "Content area %d position: %d, %d", + id - GADGET_ID_ELEMENT_CONTENT_0 + 1, sx, sy); + } } void RequestExitLevelEditor(boolean ask_if_level_has_changed) @@ -5838,10 +7578,12 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed) Request("Level has changed! Exit without saving ?", REQ_ASK | REQ_STAY_OPEN)) { +#if 1 CloseDoor(DOOR_CLOSE_1); - /* + SetDoorState(DOOR_CLOSE_2); +#else CloseDoor(DOOR_CLOSE_ALL); - */ +#endif game_status = GAME_MODE_MAIN; DrawMainMenu(); }