X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=ab28fe0cf4d002a8d4760c7243992b925f634650;hp=44ad038d4b79672d2ca5c74049a71bf32e2ad169;hb=3ae3dff29ac1a6022b1e5af414ba2c99391148c8;hpb=ed4b7eed89c292042403561e1ed1449e60888b45 diff --git a/src/editor.c b/src/editor.c index 44ad038d..ab28fe0c 100644 --- a/src/editor.c +++ b/src/editor.c @@ -11,6 +11,8 @@ * editor.c * ***********************************************************/ +#include + #include "editor.h" #include "screens.h" #include "tools.h" @@ -21,195 +23,451 @@ #include "tape.h" /* positions in the level editor */ -#define ED_WIN_MB_LEFT_XPOS 7 -#define ED_WIN_MB_LEFT_YPOS 6 -#define ED_WIN_LEVELNR_XPOS 77 -#define ED_WIN_LEVELNR_YPOS 7 -#define ED_WIN_MB_MIDDLE_XPOS 7 -#define ED_WIN_MB_MIDDLE_YPOS 258 -#define ED_WIN_MB_RIGHT_XPOS 77 -#define ED_WIN_MB_RIGHT_YPOS 258 +#define ED_WIN_MB_LEFT_XPOS 7 +#define ED_WIN_MB_LEFT_YPOS 6 +#define ED_WIN_LEVELNR_XPOS 77 +#define ED_WIN_LEVELNR_YPOS 7 +#define ED_WIN_MB_MIDDLE_XPOS 7 +#define ED_WIN_MB_MIDDLE_YPOS 258 +#define ED_WIN_MB_RIGHT_XPOS 77 +#define ED_WIN_MB_RIGHT_YPOS 258 /* other constants for the editor */ -#define ED_SCROLL_NO 0 -#define ED_SCROLL_LEFT 1 -#define ED_SCROLL_RIGHT 2 -#define ED_SCROLL_UP 4 -#define ED_SCROLL_DOWN 8 +#define ED_SCROLL_NO 0 +#define ED_SCROLL_LEFT 1 +#define ED_SCROLL_RIGHT 2 +#define ED_SCROLL_UP 4 +#define ED_SCROLL_DOWN 8 /* screens in the level editor */ -#define ED_MODE_DRAWING 0 -#define ED_MODE_INFO 1 -#define ED_MODE_PROPERTIES 2 +#define ED_MODE_DRAWING 0 +#define ED_MODE_INFO 1 +#define ED_MODE_PROPERTIES 2 /* how many steps can be cancelled */ -#define NUM_UNDO_STEPS (10 + 1) +#define NUM_UNDO_STEPS (10 + 1) -/* values for random placement */ -#define RANDOM_USE_PERCENTAGE 0 -#define RANDOM_USE_NUM_OBJECTS 1 +/* values for elements with score */ +#define MIN_SCORE 0 +#define MAX_SCORE 255 /* values for elements with content */ -#define MAX_ELEMCONT 8 +#define MIN_ELEM_CONTENT 1 +#define MAX_ELEM_CONTENT 8 /* values for the control window */ #define ED_CTRL_BUTTONS_GFX_YPOS 236 #define ED_CTRL_BUTTONS_ALT_GFX_YPOS 142 -#define ED_CTRL1_BUTTONS_HORIZ 4 -#define ED_CTRL1_BUTTONS_VERT 4 -#define ED_CTRL1_BUTTON_XSIZE 22 -#define ED_CTRL1_BUTTON_YSIZE 22 -#define ED_CTRL1_BUTTONS_XPOS 6 -#define ED_CTRL1_BUTTONS_YPOS 6 -#define ED_CTRL2_BUTTONS_HORIZ 3 -#define ED_CTRL2_BUTTONS_VERT 2 -#define ED_CTRL2_BUTTON_XSIZE 30 -#define ED_CTRL2_BUTTON_YSIZE 20 -#define ED_CTRL2_BUTTONS_XPOS 5 -#define ED_CTRL2_BUTTONS_YPOS 100 +#define ED_CTRL1_BUTTONS_HORIZ 4 +#define ED_CTRL1_BUTTONS_VERT 4 +#define ED_CTRL1_BUTTON_XSIZE 22 +#define ED_CTRL1_BUTTON_YSIZE 22 +#define ED_CTRL1_BUTTONS_XPOS 6 +#define ED_CTRL1_BUTTONS_YPOS 6 +#define ED_CTRL2_BUTTONS_HORIZ 3 +#define ED_CTRL2_BUTTONS_VERT 2 +#define ED_CTRL2_BUTTON_XSIZE 30 +#define ED_CTRL2_BUTTON_YSIZE 20 +#define ED_CTRL2_BUTTONS_XPOS 5 +#define ED_CTRL2_BUTTONS_YPOS 99 #define ED_NUM_CTRL1_BUTTONS (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT) #define ED_NUM_CTRL2_BUTTONS (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT) #define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) -/* values for properties window */ -#define ED_PROPERTIES_XPOS (TILEX - MINI_TILEX/2) +/* values for the element list */ +#define ED_ELEMENTLIST_UP_XPOS 35 +#define ED_ELEMENTLIST_UP_YPOS 5 +#define ED_ELEMENTLIST_UP_ALT_YPOS 140 +#define ED_ELEMENTLIST_DOWN_XPOS 35 +#define ED_ELEMENTLIST_DOWN_YPOS 250 +#define ED_ELEMENTLIST_DOWN_ALT_YPOS 165 +#define ED_ELEMENTLIST_UPDOWN_XSIZE 30 +#define ED_ELEMENTLIST_UPDOWN_YSIZE 25 +#define ED_ELEMENTLIST_XPOS 6 +#define ED_ELEMENTLIST_YPOS 30 +#define ED_ELEMENTLIST_ALT_YPOS 190 +#define ED_ELEMENTLIST_XSIZE 22 +#define ED_ELEMENTLIST_YSIZE 22 +#define ED_ELEMENTLIST_BUTTONS_HORIZ 4 +#define ED_ELEMENTLIST_BUTTONS_VERT 10 +#define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \ + ED_ELEMENTLIST_BUTTONS_VERT) + +/* values for the setting windows */ +#define ED_SETTINGS_XPOS (MINI_TILEX + 8) +#define ED_SETTINGS2_XPOS MINI_TILEX +#define ED_SETTINGS_YPOS MINI_TILEY +#define ED_SETTINGS2_YPOS (ED_SETTINGS_YPOS + 12 * TILEY - 2) /* values for counter gadgets */ -#define ED_COUNT_VALUE_XOFFSET 5 -#define ED_COUNT_VALUE_YOFFSET 3 -#define ED_COUNT_SCORE_XPOS ED_PROPERTIES_XPOS -#define ED_COUNT_SCORE_YPOS (14 * MINI_TILEY) -#define ED_COUNT_ELEMCONT_XPOS ED_PROPERTIES_XPOS -#define ED_COUNT_ELEMCONT_YPOS (17 * MINI_TILEY) +#define ED_COUNT_ELEM_SCORE_XPOS ED_SETTINGS_XPOS +#define ED_COUNT_ELEM_SCORE_YPOS (14 * MINI_TILEY) +#define ED_COUNT_ELEM_CONTENT_XPOS ED_SETTINGS_XPOS +#define ED_COUNT_ELEM_CONTENT_YPOS (19 * MINI_TILEY) + +#define ED_COUNTER_YSTART (ED_SETTINGS_YPOS + 2 * TILEY) +#define ED_COUNTER_YDISTANCE (3 * MINI_TILEY) +#define ED_COUNTER_YPOS(n) (ED_COUNTER_YSTART + \ + n * ED_COUNTER_YDISTANCE) +#define ED_COUNTER2_YPOS(n) (ED_COUNTER_YSTART + \ + n * ED_COUNTER_YDISTANCE - 2) +/* standard distances */ +#define ED_BORDER_SIZE 3 +#define ED_GADGET_DISTANCE 2 /* values for element content drawing areas */ -#define ED_AREA_ELEMCONT_XPOS (TILEX) -#define ED_AREA_ELEMCONT_YPOS (10 * TILEY) +#define ED_AREA_ELEM_CONTENT_XPOS ( 2 * MINI_TILEX) +#define ED_AREA_ELEM_CONTENT_YPOS (22 * 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 */ -#define ED_SCROLLBUTTON_XPOS 24 -#define ED_SCROLLBUTTON_YPOS 0 -#define ED_SCROLLBAR_XPOS 24 -#define ED_SCROLLBAR_YPOS 64 - -#define ED_SCROLLBUTTON_XSIZE 16 -#define ED_SCROLLBUTTON_YSIZE 16 - -#define ED_SCROLL_UP_XPOS (SXSIZE - ED_SCROLLBUTTON_XSIZE) -#define ED_SCROLL_UP_YPOS (0) -#define ED_SCROLL_DOWN_XPOS ED_SCROLL_UP_XPOS -#define ED_SCROLL_DOWN_YPOS (SYSIZE - 3 * ED_SCROLLBUTTON_YSIZE) -#define ED_SCROLL_LEFT_XPOS (0) -#define ED_SCROLL_LEFT_YPOS (SYSIZE - 2 * ED_SCROLLBUTTON_YSIZE) -#define ED_SCROLL_RIGHT_XPOS (SXSIZE - 2 * ED_SCROLLBUTTON_XSIZE) -#define ED_SCROLL_RIGHT_YPOS ED_SCROLL_LEFT_YPOS -#define ED_SCROLL_VERTICAL_XPOS ED_SCROLL_UP_XPOS -#define ED_SCROLL_VERTICAL_YPOS (ED_SCROLL_UP_YPOS + ED_SCROLLBUTTON_YSIZE) -#define ED_SCROLL_VERTICAL_XSIZE ED_SCROLLBUTTON_XSIZE -#define ED_SCROLL_VERTICAL_YSIZE (SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE) +#define ED_SCROLLBUTTON_XPOS 24 +#define ED_SCROLLBUTTON_YPOS 0 +#define ED_SCROLLBAR_XPOS 24 +#define ED_SCROLLBAR_YPOS 64 + +#define ED_SCROLLBUTTON_XSIZE 16 +#define ED_SCROLLBUTTON_YSIZE 16 + +#define ED_SCROLL_UP_XPOS (SXSIZE - ED_SCROLLBUTTON_XSIZE) +#define ED_SCROLL_UP_YPOS (0) +#define ED_SCROLL_DOWN_XPOS ED_SCROLL_UP_XPOS +#define ED_SCROLL_DOWN_YPOS (SYSIZE - 3 * ED_SCROLLBUTTON_YSIZE) +#define ED_SCROLL_LEFT_XPOS (0) +#define ED_SCROLL_LEFT_YPOS (SYSIZE - 2 * ED_SCROLLBUTTON_YSIZE) +#define ED_SCROLL_RIGHT_XPOS (SXSIZE - 2 * ED_SCROLLBUTTON_XSIZE) +#define ED_SCROLL_RIGHT_YPOS ED_SCROLL_LEFT_YPOS #define ED_SCROLL_HORIZONTAL_XPOS (ED_SCROLL_LEFT_XPOS + ED_SCROLLBUTTON_XSIZE) -#define ED_SCROLL_HORIZONTAL_YPOS ED_SCROLL_LEFT_YPOS -#define ED_SCROLL_HORIZONTAL_XSIZE (SXSIZE - 3 * ED_SCROLLBUTTON_XSIZE) -#define ED_SCROLL_HORIZONTAL_YSIZE ED_SCROLLBUTTON_YSIZE - -/* control button identifiers */ -#define ED_CTRL_ID_NONE -1 - -#define ED_CTRL_ID_SINGLE_ITEMS 0 -#define ED_CTRL_ID_CONNECTED_ITEMS 1 -#define ED_CTRL_ID_LINE 2 -#define ED_CTRL_ID_TEXT 3 -#define ED_CTRL_ID_RECTANGLE 4 -#define ED_CTRL_ID_FILLED_BOX 5 -#define ED_CTRL_ID_WRAP_UP 6 -#define ED_CTRL_ID_PROPERTIES 7 -#define ED_CTRL_ID_FLOOD_FILL 8 -#define ED_CTRL_ID_WRAP_LEFT 9 -#define ED_CTRL_ID_UNUSED1 10 -#define ED_CTRL_ID_WRAP_RIGHT 11 -#define ED_CTRL_ID_RANDOM_PLACEMENT 12 -#define ED_CTRL_ID_GRAB_BRUSH 13 -#define ED_CTRL_ID_WRAP_DOWN 14 -#define ED_CTRL_ID_PICK_ELEMENT 15 -#define ED_CTRL_ID_UNDO 16 -#define ED_CTRL_ID_INFO 17 -#define ED_CTRL_ID_SAVE 18 -#define ED_CTRL_ID_CLEAR 19 -#define ED_CTRL_ID_TEST 20 -#define ED_CTRL_ID_EXIT 21 +#define ED_SCROLL_HORIZONTAL_YPOS ED_SCROLL_LEFT_YPOS +#define ED_SCROLL_HORIZONTAL_XSIZE (SXSIZE - 3 * ED_SCROLLBUTTON_XSIZE) +#define ED_SCROLL_HORIZONTAL_YSIZE ED_SCROLLBUTTON_YSIZE +#define ED_SCROLL_VERTICAL_XPOS ED_SCROLL_UP_XPOS +#define ED_SCROLL_VERTICAL_YPOS (ED_SCROLL_UP_YPOS + ED_SCROLLBUTTON_YSIZE) +#define ED_SCROLL_VERTICAL_XSIZE ED_SCROLLBUTTON_XSIZE +#define ED_SCROLL_VERTICAL_YSIZE (SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE) + +/* values for checkbutton gadgets */ +#define ED_CHECKBUTTON_XSIZE ED_BUTTON_COUNT_XSIZE +#define ED_CHECKBUTTON_YSIZE ED_BUTTON_COUNT_YSIZE +#define ED_CHECKBUTTON_UNCHECKED_XPOS ED_BUTTON_MINUS_XPOS +#define ED_CHECKBUTTON_CHECKED_XPOS ED_BUTTON_PLUS_XPOS +#define ED_CHECKBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 22) +#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 88) + +#define GADGET_ID_NONE -1 + +/* drawing toolbox buttons */ +#define GADGET_ID_SINGLE_ITEMS 0 +#define GADGET_ID_CONNECTED_ITEMS 1 +#define GADGET_ID_LINE 2 +#define GADGET_ID_ARC 3 +#define GADGET_ID_RECTANGLE 4 +#define GADGET_ID_FILLED_BOX 5 +#define GADGET_ID_WRAP_UP 6 +#define GADGET_ID_TEXT 7 +#define GADGET_ID_FLOOD_FILL 8 +#define GADGET_ID_WRAP_LEFT 9 +#define GADGET_ID_PROPERTIES 10 +#define GADGET_ID_WRAP_RIGHT 11 +#define GADGET_ID_RANDOM_PLACEMENT 12 +#define GADGET_ID_GRAB_BRUSH 13 +#define GADGET_ID_WRAP_DOWN 14 +#define GADGET_ID_PICK_ELEMENT 15 +#define GADGET_ID_UNDO 16 +#define GADGET_ID_INFO 17 +#define GADGET_ID_SAVE 18 +#define GADGET_ID_CLEAR 19 +#define GADGET_ID_TEST 20 +#define GADGET_ID_EXIT 21 /* counter button identifiers */ -#define ED_CTRL_ID_SCORE_DOWN 22 -#define ED_CTRL_ID_SCORE_UP 23 -#define ED_CTRL_ID_ELEMCONT_DOWN 24 -#define ED_CTRL_ID_ELEMCONT_UP 25 +#define GADGET_ID_ELEM_SCORE_DOWN 22 +#define GADGET_ID_ELEM_SCORE_TEXT 23 +#define GADGET_ID_ELEM_SCORE_UP 24 +#define GADGET_ID_ELEM_CONTENT_DOWN 25 +#define GADGET_ID_ELEM_CONTENT_TEXT 26 +#define GADGET_ID_ELEM_CONTENT_UP 27 +#define GADGET_ID_LEVEL_XSIZE_DOWN 28 +#define GADGET_ID_LEVEL_XSIZE_TEXT 29 +#define GADGET_ID_LEVEL_XSIZE_UP 30 +#define GADGET_ID_LEVEL_YSIZE_DOWN 31 +#define GADGET_ID_LEVEL_YSIZE_TEXT 32 +#define GADGET_ID_LEVEL_YSIZE_UP 33 +#define GADGET_ID_LEVEL_RANDOM_DOWN 34 +#define GADGET_ID_LEVEL_RANDOM_TEXT 35 +#define GADGET_ID_LEVEL_RANDOM_UP 36 +#define GADGET_ID_LEVEL_COLLECT_DOWN 37 +#define GADGET_ID_LEVEL_COLLECT_TEXT 38 +#define GADGET_ID_LEVEL_COLLECT_UP 39 +#define GADGET_ID_LEVEL_TIMELIMIT_DOWN 40 +#define GADGET_ID_LEVEL_TIMELIMIT_TEXT 41 +#define GADGET_ID_LEVEL_TIMELIMIT_UP 42 +#define GADGET_ID_LEVEL_TIMESCORE_DOWN 43 +#define GADGET_ID_LEVEL_TIMESCORE_TEXT 44 +#define GADGET_ID_LEVEL_TIMESCORE_UP 45 /* drawing area identifiers */ -#define ED_CTRL_ID_DRAWING_LEVEL 26 -#define ED_CTRL_ID_ELEMCONT_0 27 -#define ED_CTRL_ID_ELEMCONT_7 34 -#define ED_CTRL_ID_AMOEBA_CONTENT 35 +#define GADGET_ID_DRAWING_LEVEL 46 +#define GADGET_ID_ELEM_CONTENT_0 47 +#define GADGET_ID_ELEM_CONTENT_1 48 +#define GADGET_ID_ELEM_CONTENT_2 49 +#define GADGET_ID_ELEM_CONTENT_3 50 +#define GADGET_ID_ELEM_CONTENT_4 51 +#define GADGET_ID_ELEM_CONTENT_5 52 +#define GADGET_ID_ELEM_CONTENT_6 53 +#define GADGET_ID_ELEM_CONTENT_7 54 +#define GADGET_ID_AMOEBA_CONTENT 55 /* text input identifiers */ -#define ED_CTRL_ID_LEVEL_NAME 36 +#define GADGET_ID_LEVEL_NAME 56 +#define GADGET_ID_LEVEL_AUTHOR 57 /* gadgets for scrolling of drawing area */ -#define ED_CTRL_ID_SCROLL_UP 37 -#define ED_CTRL_ID_SCROLL_DOWN 38 -#define ED_CTRL_ID_SCROLL_LEFT 39 -#define ED_CTRL_ID_SCROLL_RIGHT 40 -#define ED_CTRL_ID_SCROLL_VERTICAL 41 -#define ED_CTRL_ID_SCROLL_HORIZONTAL 42 - -#define ED_NUM_GADGETS 43 +#define GADGET_ID_SCROLL_UP 58 +#define GADGET_ID_SCROLL_DOWN 59 +#define GADGET_ID_SCROLL_LEFT 60 +#define GADGET_ID_SCROLL_RIGHT 61 +#define GADGET_ID_SCROLL_HORIZONTAL 62 +#define GADGET_ID_SCROLL_VERTICAL 63 + +/* gadgets for scrolling element list */ +#define GADGET_ID_ELEMENTLIST_UP 64 +#define GADGET_ID_ELEMENTLIST_DOWN 65 + +/* gadgets for buttons in element list */ +#define GADGET_ID_ELEMENTLIST_FIRST 66 +#define GADGET_ID_ELEMENTLIST_LAST 105 + +/* buttons for level settings */ +#define GADGET_ID_RANDOM_PERCENTAGE 106 +#define GADGET_ID_RANDOM_QUANTITY 107 +#define GADGET_ID_RANDOM_RESTRICTED 108 +#define GADGET_ID_DOUBLE_SPEED 109 +#define GADGET_ID_STICK_ELEMENT 110 + +/* another drawing area for random placement */ +#define GADGET_ID_RANDOM_BACKGROUND 111 + +#define NUM_EDITOR_GADGETS 112 + +/* radio button numbers */ +#define RADIO_NR_NONE 0 +#define RADIO_NR_DRAWING_TOOLBOX 1 +#define RADIO_NR_RANDOM_ELEMENTS 2 /* values for counter gadgets */ -#define ED_COUNTER_SCORE 0 -#define ED_COUNTER_ELEMCONT 1 +#define ED_COUNTER_ID_ELEM_SCORE 0 +#define ED_COUNTER_ID_ELEM_CONTENT 1 +#define ED_COUNTER_ID_LEVEL_XSIZE 2 +#define ED_COUNTER_ID_LEVEL_YSIZE 3 +#define ED_COUNTER_ID_LEVEL_COLLECT 4 +#define ED_COUNTER_ID_LEVEL_TIMELIMIT 5 +#define ED_COUNTER_ID_LEVEL_TIMESCORE 6 +#define ED_COUNTER_ID_LEVEL_RANDOM 7 + +#define ED_NUM_COUNTERBUTTONS 8 + +#define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE +#define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM + +/* values for scrollbutton gadgets */ +#define ED_SCROLLBUTTON_ID_AREA_UP 0 +#define ED_SCROLLBUTTON_ID_AREA_DOWN 1 +#define ED_SCROLLBUTTON_ID_AREA_LEFT 2 +#define ED_SCROLLBUTTON_ID_AREA_RIGHT 3 +#define ED_SCROLLBUTTON_ID_LIST_UP 4 +#define ED_SCROLLBUTTON_ID_LIST_DOWN 5 + +#define ED_NUM_SCROLLBUTTONS 6 + +/* values for scrollbar gadgets */ +#define ED_SCROLLBAR_ID_HORIZONTAL 0 +#define ED_SCROLLBAR_ID_VERTICAL 1 -#define ED_NUM_COUNTERBUTTONS 2 -#define ED_NUM_SCROLLBUTTONS 4 #define ED_NUM_SCROLLBARS 2 +/* values for text input gadgets */ +#define ED_TEXTINPUT_ID_LEVEL_NAME 0 +#define ED_TEXTINPUT_ID_LEVEL_AUTHOR 1 + +#define ED_NUM_TEXTINPUT 2 + +#define ED_TEXTINPUT_ID_LEVEL_FIRST ED_TEXTINPUT_ID_LEVEL_NAME +#define ED_TEXTINPUT_ID_LEVEL_LAST ED_TEXTINPUT_ID_LEVEL_AUTHOR + +/* values for checkbutton gadgets */ +#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0 +#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 1 +#define ED_CHECKBUTTON_ID_STICK_ELEMENT 2 + +#define ED_NUM_CHECKBUTTONS 3 + +#define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED +#define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED + +/* values for radiobutton gadgets */ +#define ED_RADIOBUTTON_ID_PERCENTAGE 0 +#define ED_RADIOBUTTON_ID_QUANTITY 1 + +#define ED_NUM_RADIOBUTTONS 2 + +#define ED_RADIOBUTTON_ID_LEVEL_FIRST ED_RADIOBUTTON_ID_PERCENTAGE +#define ED_RADIOBUTTON_ID_LEVEL_LAST ED_RADIOBUTTON_ID_QUANTITY + /* values for CopyLevelToUndoBuffer() */ #define UNDO_IMMEDIATE 0 #define UNDO_ACCUMULATE 1 -static char *control_infotext[ED_NUM_CTRL_BUTTONS] = -{ - "draw single items", - "draw connected items", - "draw lines", - "enter text elements", - "draw outline rectangles", - "draw filled boxes", - "wrap (rotate) level up", - "properties of drawing element", - "flood fill", - "wrap (rotate) level left", - "", - "wrap (rotate) level right", - "random element placement", - "grab brush", - "wrap (rotate) level down", - "pick drawing element from editing area", - "undo last operation", - "level properties", - "save level", - "clear level", - "test level", - "exit level editor", +/* values for ClearEditorGadgetInfoText() and HandleGadgetInfoText() */ +#define INFOTEXT_XPOS SX +#define INFOTEXT_YPOS (SY + SYSIZE - MINI_TILEX + 2) +#define INFOTEXT_XSIZE SXSIZE +#define INFOTEXT_YSIZE MINI_TILEX +#define MAX_INFOTEXT_LEN (SXSIZE / FONT2_XSIZE) + +static struct +{ + char shortcut; + char *text; +} control_info[ED_NUM_CTRL_BUTTONS] = +{ + { 's', "draw single items" }, + { 'd', "draw connected items" }, + { 'l', "draw lines" }, + { 'a', "draw arcs" }, + { 'r', "draw outline rectangles" }, + { 'R', "draw filled rectangles" }, + { '\0', "wrap (rotate) level up" }, + { 't', "enter text elements" }, + { 'f', "flood fill" }, + { '\0', "wrap (rotate) level left" }, + { '?', "properties of drawing element" }, + { '\0', "wrap (rotate) level right" }, + { '\0', "random element placement" }, + { 'b', "grab brush" }, + { '\0', "wrap (rotate) level down" }, + { ',', "pick drawing element" }, + { 'U', "undo last operation" }, + { 'I', "level properties" }, + { 'S', "save level" }, + { 'C', "clear level" }, + { 'T', "test level" }, + { 'E', "exit level editor" } }; +/* pointers to counter values */ +static int *gadget_elem_score_value = NULL; +static int *gadget_elem_content_value = NULL; +static int *gadget_level_xsize_value = NULL; +static int *gadget_level_ysize_value = NULL; +static int *gadget_level_random_value = NULL; +static int *gadget_level_collect_value = NULL; +static int *gadget_level_timelimit_value = NULL; +static int *gadget_level_timescore_value = NULL; + static struct { int x, y; - int gadget_id; + int min_value, max_value; + int gadget_id_down, gadget_id_up; + int gadget_id_text; + int **counter_value; + char *infotext_above, *infotext_right; } counterbutton_info[ED_NUM_COUNTERBUTTONS] = { - { ED_COUNT_SCORE_XPOS, ED_COUNT_SCORE_YPOS, ED_CTRL_ID_SCORE_DOWN }, - { ED_COUNT_ELEMCONT_XPOS, ED_COUNT_ELEMCONT_YPOS, ED_CTRL_ID_ELEMCONT_DOWN } + { + ED_COUNT_ELEM_SCORE_XPOS, ED_COUNT_ELEM_SCORE_YPOS, + MIN_SCORE, MAX_SCORE, + GADGET_ID_ELEM_SCORE_DOWN, GADGET_ID_ELEM_SCORE_UP, + GADGET_ID_ELEM_SCORE_TEXT, + &gadget_elem_score_value, + "element score", NULL + }, + { + ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS, + MIN_ELEM_CONTENT, MAX_ELEM_CONTENT, + GADGET_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP, + GADGET_ID_ELEM_CONTENT_TEXT, + &gadget_elem_content_value, + "element content", NULL + }, + { + ED_SETTINGS_XPOS, 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_level_xsize_value, + "playfield size", "width", + }, + { + ED_SETTINGS_XPOS + 2 * DXSIZE, 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_level_ysize_value, + NULL, "height", + }, + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(3), + 0, 999, + GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP, + GADGET_ID_LEVEL_COLLECT_TEXT, + &gadget_level_collect_value, + "number of emeralds to collect", NULL + }, + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(4), + 0, 999, + GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP, + GADGET_ID_LEVEL_TIMELIMIT_TEXT, + &gadget_level_timelimit_value, + "time available to solve level", "(0 => no time limit)" + }, + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(5), + 0, 255, + GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP, + GADGET_ID_LEVEL_TIMESCORE_TEXT, + &gadget_level_timescore_value, + "score for each 10 seconds left", NULL + }, + { + ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(8), + 1, 100, + GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP, + GADGET_ID_LEVEL_RANDOM_TEXT, + &gadget_level_random_value, + "random element placement", "in" + } +}; + +static struct +{ + int x, y; + int gadget_id; + int size; + char *value; + char *infotext; +} textinput_info[ED_NUM_TEXTINPUT] = +{ + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(0), + GADGET_ID_LEVEL_NAME, + MAX_LEVEL_NAME_LEN, + level.name, + "Title" + }, + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(1), + GADGET_ID_LEVEL_AUTHOR, + MAX_LEVEL_AUTHOR_LEN, + level.author, + "Author" + } }; static struct @@ -217,28 +475,44 @@ static struct int xpos, ypos; int x, y; int gadget_id; - char *text; + char *infotext; } scrollbutton_info[ED_NUM_SCROLLBUTTONS] = { { ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE, - ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS, ED_CTRL_ID_SCROLL_UP, + ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS, + GADGET_ID_SCROLL_UP, "scroll level editing area up" }, { ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 1 * ED_SCROLLBUTTON_YSIZE, - ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS, ED_CTRL_ID_SCROLL_DOWN, + ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS, + GADGET_ID_SCROLL_DOWN, "scroll level editing area down" }, { ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 2 * ED_SCROLLBUTTON_YSIZE, - ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS, ED_CTRL_ID_SCROLL_LEFT, + ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS, + GADGET_ID_SCROLL_LEFT, "scroll level editing area left" }, { ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 3 * ED_SCROLLBUTTON_YSIZE, - ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS, ED_CTRL_ID_SCROLL_RIGHT, + ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS, + GADGET_ID_SCROLL_RIGHT, "scroll level editing area right" + }, + { + ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS, + ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS, + GADGET_ID_ELEMENTLIST_UP, + "scroll element list up ('Page Up')" + }, + { + ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS, + ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS, + GADGET_ID_ELEMENTLIST_DOWN, + "scroll element list down ('Page Down')" } }; @@ -249,29 +523,115 @@ static struct int width, height; int type; int gadget_id; - char *text; + char *infotext; } scrollbar_info[ED_NUM_SCROLLBARS] = { + { + ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS, + ED_SCROLL_HORIZONTAL_XPOS, ED_SCROLL_HORIZONTAL_YPOS, + ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE, + GD_TYPE_SCROLLBAR_HORIZONTAL, + GADGET_ID_SCROLL_HORIZONTAL, + "scroll level editing area horizontally" + }, { ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS, ED_SCROLL_VERTICAL_XPOS, ED_SCROLL_VERTICAL_YPOS, ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE, GD_TYPE_SCROLLBAR_VERTICAL, - ED_CTRL_ID_SCROLL_VERTICAL, + GADGET_ID_SCROLL_VERTICAL, "scroll level editing area vertically" + } +}; + +/* values for random placement */ +#define RANDOM_USE_PERCENTAGE 0 +#define RANDOM_USE_QUANTITY 1 + +static int random_placement_value = 10; +static int random_placement_method = RANDOM_USE_QUANTITY; +static int random_placement_background_element = EL_ERDREICH; +static boolean random_placement_background_restricted = FALSE; +static boolean stick_element_properties_window = FALSE; + +static struct +{ + int x, y; + int gadget_id; + int radio_button_nr; + int *value; + int checked_value; + char *text, *infotext; +} radiobutton_info[ED_NUM_RADIOBUTTONS] = +{ + { + ED_SETTINGS_XPOS + 160, ED_COUNTER2_YPOS(8), + GADGET_ID_RANDOM_PERCENTAGE, + RADIO_NR_RANDOM_ELEMENTS, + &random_placement_method, RANDOM_USE_PERCENTAGE, + "percentage", "use percentage for random elements" }, { - ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS, - ED_SCROLL_HORIZONTAL_XPOS, ED_SCROLL_HORIZONTAL_YPOS, - ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE, - GD_TYPE_SCROLLBAR_HORIZONTAL, - ED_CTRL_ID_SCROLL_HORIZONTAL, - "scroll level editing area horizontally" + ED_SETTINGS_XPOS + 340, ED_COUNTER2_YPOS(8), + GADGET_ID_RANDOM_QUANTITY, + RADIO_NR_RANDOM_ELEMENTS, + &random_placement_method, RANDOM_USE_QUANTITY, + "quantity", "use quantity for random elements" + } +}; + +static struct +{ + int x, y; + int gadget_id; + boolean *value; + char *text, *infotext; +} checkbutton_info[ED_NUM_CHECKBUTTONS] = +{ + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(6) - MINI_TILEY, + GADGET_ID_DOUBLE_SPEED, + &level.double_speed, + "double speed movement", "set movement speed of player" + }, + { + ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(9) - MINI_TILEY, + GADGET_ID_RANDOM_RESTRICTED, + &random_placement_background_restricted, + "restrict random placement to", "set random placement restriction" }, + { + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(4), + GADGET_ID_STICK_ELEMENT, + &stick_element_properties_window, + "stick window to edit content", "stick window to edit content" + } }; +/* maximal size of level editor drawing area */ +#define MAX_ED_FIELDX (2 * SCR_FIELDX) +#define MAX_ED_FIELDY (2 * SCR_FIELDY - 1) + +/* actual size of level editor drawing area */ +static int ed_fieldx = MAX_ED_FIELDX - 1, ed_fieldy = MAX_ED_FIELDY - 1; + +/* actual position of level editor drawing area in level playfield */ +static int level_xpos = -1, level_ypos = -1; + +#define IN_ED_FIELD(x,y) ((x)>=0 && (x)=0 &&(y)'), + EL_CHAR('?'), + + EL_CHAR('@'), + EL_CHAR('A'), + EL_CHAR('B'), + EL_CHAR('C'), - EL_CHAR_APOSTR, - EL_CHAR_KLAMM1, - EL_CHAR_KLAMM2, - EL_CHAR_PLUS, + EL_CHAR('D'), + EL_CHAR('E'), + EL_CHAR('F'), + EL_CHAR('G'), - EL_CHAR_KOMMA, - EL_CHAR_MINUS, - EL_CHAR_PUNKT, - EL_CHAR_SLASH, - - EL_CHAR_0 + 0, - EL_CHAR_0 + 1, - EL_CHAR_0 + 2, - EL_CHAR_0 + 3, - - EL_CHAR_0 + 4, - EL_CHAR_0 + 5, - EL_CHAR_0 + 6, - EL_CHAR_0 + 7, - - EL_CHAR_0 + 8, - EL_CHAR_0 + 9, - EL_CHAR_DOPPEL, - EL_CHAR_SEMIKL, - - EL_CHAR_LT, - EL_CHAR_GLEICH, - EL_CHAR_GT, - EL_CHAR_FRAGE, - - EL_CHAR_AT, - EL_CHAR_A + 0, - EL_CHAR_A + 1, - EL_CHAR_A + 2, - - EL_CHAR_A + 3, - EL_CHAR_A + 4, - EL_CHAR_A + 5, - EL_CHAR_A + 6, - - EL_CHAR_A + 7, - EL_CHAR_A + 8, - EL_CHAR_A + 9, - EL_CHAR_A + 10, - - EL_CHAR_A + 11, - EL_CHAR_A + 12, - EL_CHAR_A + 13, - EL_CHAR_A + 14, - - EL_CHAR_A + 15, - EL_CHAR_A + 16, - EL_CHAR_A + 17, - EL_CHAR_A + 18, - - EL_CHAR_A + 19, - EL_CHAR_A + 20, - EL_CHAR_A + 21, - EL_CHAR_A + 22, - - EL_CHAR_A + 23, - EL_CHAR_A + 24, - EL_CHAR_A + 25, - EL_CHAR_AE, - - EL_CHAR_OE, - EL_CHAR_UE, - EL_CHAR_COPY, - EL_LEERRAUM + EL_CHAR('H'), + EL_CHAR('I'), + EL_CHAR('J'), + EL_CHAR('K'), + + EL_CHAR('L'), + EL_CHAR('M'), + EL_CHAR('N'), + EL_CHAR('O'), + + EL_CHAR('P'), + EL_CHAR('Q'), + EL_CHAR('R'), + EL_CHAR('S'), + + EL_CHAR('T'), + EL_CHAR('U'), + EL_CHAR('V'), + EL_CHAR('W'), + + EL_CHAR('X'), + EL_CHAR('Y'), + EL_CHAR('Z'), + EL_CHAR('Ä'), + + EL_CHAR('Ö'), + EL_CHAR('Ü'), + EL_CHAR('^'), + EL_CHAR(' ') }; int elements_in_list = sizeof(editor_element)/sizeof(int); @@ -690,20 +1039,20 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll) XCopyArea(display, drawto, drawto, gc, SX + (dx == -1 ? MINI_TILEX : 0), SY + (dy == -1 ? MINI_TILEY : 0), - (ED_FIELDX * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0), - (ED_FIELDY * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0), + (ed_fieldx * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0), + (ed_fieldy * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0), SX + (dx == +1 ? MINI_TILEX : 0), SY + (dy == +1 ? MINI_TILEY : 0)); if (dx) { - x = (dx == 1 ? 0 : ED_FIELDX - 1); - for(y=0; ywidth + ED_GADGET_DISTANCE; /* xpos of text count button */ + + if (j == 0) + { + id = counterbutton_info[i].gadget_id_text; + event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING; + + gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS; + gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS; + + gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_INFO_TEXT, "enter counter value", + GDI_X, xpos, + GDI_Y, ypos, + GDI_TYPE, GD_TYPE_TEXTINPUT_NUMERIC, + GDI_NUMBER_VALUE, 0, + GDI_NUMBER_MIN, counterbutton_info[i].min_value, + GDI_NUMBER_MAX, counterbutton_info[i].max_value, + GDI_TEXT_SIZE, 3, + GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y, + GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y, + GDI_DESIGN_BORDER, ED_BORDER_SIZE, + GDI_EVENT_MASK, event_mask, + GDI_CALLBACK_ACTION, HandleCounterButtons, + GDI_END); + + if (gi == NULL) + Error(ERR_EXIT, "cannot create gadget"); + + level_editor_gadget[id] = gi; + xpos += gi->width + ED_GADGET_DISTANCE; /* xpos of up count button */ + } } } } @@ -905,12 +1363,12 @@ static void CreateDrawingAreas() GD_EVENT_OFF_BORDERS; /* one for the level drawing area ... */ - id = ED_CTRL_ID_DRAWING_LEVEL; + 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_AREA_SIZE, ed_fieldx, ed_fieldy, GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_INFO, HandleDrawingAreaInfo, @@ -923,12 +1381,12 @@ static void CreateDrawingAreas() level_editor_gadget[id] = gi; /* ... up to eight areas for element content ... */ - for (i=0; ix < DX) + UnmapGadget(level_editor_gadget[i]); } void UnmapLevelEditorGadgets() { int i; - for (i=0; itext.value, level.name); + strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name); MapControlButtons(); @@ -1264,203 +1852,128 @@ void DrawLevelEd() */ } -void DrawControlWindow() +static void AdjustDrawingAreaGadgets() { - int i,x,y; - - ClearWindow(); - UnmapLevelEditorWindowGadgets(); - - /* Inhalt der Mampfer */ - DrawText(ED_COUNT_GADGET_XPOS+1,SY+6, - "Contents of a smashed cruncher:",FS_SMALL,FC_YELLOW); - for(i=0;i<4;i++) for(y=0;y<4;y++) for(x=0;x<4;x++) - { - DrawMiniElement(1+5*i+x,2+y,EL_ERDREICH); - XFillRectangle(display,drawto,gc, - SX+(1+5*i)*MINI_TILEX+MINI_TILEX/2-1, - SY+(2)*MINI_TILEY+MINI_TILEY/2-1, - 3*MINI_TILEX+2,3*MINI_TILEY+2); - } - XCopyArea(display,drawto,drawto,gc, - SX+1*MINI_TILEX,SY+2*MINI_TILEY, - 4*5*MINI_TILEX,5*MINI_TILEY, - SX+1*MINI_TILEX-MINI_TILEX/2,SY+2*MINI_TILEY-MINI_TILEY/2); - for(i=0;i<4;i++) - { - for(y=0;y<3;y++) for(x=0;x<3;x++) - DrawMiniElement(1+5*i+x,2+y,level.mampfer_inhalt[i][x][y]); - - DrawText(SX+MINI_TILEX+(5*i+1)*MINI_TILEX+1, - SY+2*MINI_TILEY+(4)*MINI_TILEY-4, - int2str(i+1,1),FS_SMALL,FC_YELLOW); - } - - /* Inhalt der Amöbe */ - for(y=0;y<2;y++) for(x=0;x<2;x++) - { - DrawMiniElement(29+x,26+y,EL_ERDREICH); - XFillRectangle(display,drawto,gc, - SX+29*MINI_TILEX+MINI_TILEX/2-1, - SY+26*MINI_TILEY+MINI_TILEY/2-1, - MINI_TILEX+2,MINI_TILEY+2); - } - XCopyArea(display,drawto,drawto,gc, - SX+29*MINI_TILEX,SY+26*MINI_TILEY, - 3*MINI_TILEX,3*MINI_TILEY, - SX+29*MINI_TILEX-MINI_TILEX/2,SY+26*MINI_TILEY-MINI_TILEY/2); - DrawMiniElement(29,26,level.amoebe_inhalt); - - for(i=0;i<11+3+2;i++) - { - XCopyArea(display,pix[PIX_DOOR],drawto,gc, - DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS, - DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS, - DXSIZE-4,ED_BUTTON_MINUS_YSIZE, - ED_COUNT_GADGET_XPOS, - ED_COUNT_GADGET_YPOS+i*ED_COUNT_GADGET_YSIZE); - - if (i<11) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+i*ED_COUNT_GADGET_YSIZE, - int2str(level.score[i],3),FS_SMALL,FC_YELLOW); - else if (i==11) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+11*ED_COUNT_GADGET_YSIZE, - int2str(level.tempo_amoebe,3),FS_SMALL,FC_YELLOW); - else if (i==12) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+12*ED_COUNT_GADGET_YSIZE, - int2str(level.dauer_sieb,3),FS_SMALL,FC_YELLOW); - else if (i==13) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+13*ED_COUNT_GADGET_YSIZE, - int2str(level.dauer_ablenk,3),FS_SMALL,FC_YELLOW); - else if (i==14) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+14*ED_COUNT_GADGET_YSIZE, - int2str(level.edelsteine,3),FS_SMALL,FC_YELLOW); - else if (i==15) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+15*ED_COUNT_GADGET_YSIZE, - int2str(level.time,3),FS_SMALL,FC_YELLOW); - } - - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+0*ED_COUNT_TEXT_YSIZE, - "Score for Emerald",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+1*ED_COUNT_TEXT_YSIZE, - "Score for Diamond",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+2*ED_COUNT_TEXT_YSIZE, - "Score for smashing a Bug",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+3*ED_COUNT_TEXT_YSIZE, - "Score for smashing a Spaceship",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+4*ED_COUNT_TEXT_YSIZE, - "Score for smashing a Cruncher",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+5*ED_COUNT_TEXT_YSIZE, - "Score for smashing an Alien",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+6*ED_COUNT_TEXT_YSIZE, - "Score for smashing a Pacman",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+7*ED_COUNT_TEXT_YSIZE, - "Score for cracking a nut",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+8*ED_COUNT_TEXT_YSIZE, - "Score for dynamite",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+9*ED_COUNT_TEXT_YSIZE, - "Score for key",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+10*ED_COUNT_TEXT_YSIZE, - "Score for each 10 seconds left",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+11*ED_COUNT_TEXT_YSIZE, - "Speed of the amoeba / Content",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+12*ED_COUNT_TEXT_YSIZE, - "Time for magic wall",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+13*ED_COUNT_TEXT_YSIZE, - "Time for wheel",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+14*ED_COUNT_TEXT_YSIZE, - "Emeralds needed in this level",FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+15*ED_COUNT_TEXT_YSIZE, - "Time available for this level",FS_SMALL,FC_YELLOW); - - XCopyArea(display,pix[PIX_DOOR],drawto,gc, - DOOR_GFX_PAGEX4+ED_WIN_COUNT_XPOS, - DOOR_GFX_PAGEY1+ED_WIN_COUNT_YPOS, - ED_WIN_COUNT_XSIZE,ED_WIN_COUNT_YSIZE, - ED_COUNT_GADGET_XPOS, - ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE); - for(i=1;i<31;i++) - XCopyArea(display,pix[PIX_DOOR],drawto,gc, - DOOR_GFX_PAGEX4+ED_WIN_COUNT_XPOS+3+2*FONT2_XSIZE, - DOOR_GFX_PAGEY1+ED_WIN_COUNT_YPOS, - ED_WIN_COUNT_XSIZE-3-2*FONT2_XSIZE,ED_WIN_COUNT_YSIZE, - ED_COUNT_GADGET_XPOS+3+i*FONT2_XSIZE, - ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE); - DrawText(ED_COUNT_GADGET_XPOS+5, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - level.name,FS_SMALL,FC_YELLOW); - DrawText(ED_COUNT_GADGET_XPOS+(30+3)*FONT2_XSIZE-5, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - "Title",FS_SMALL,FC_YELLOW); - - DrawText(ED_SIZE_GADGET_XPOS,ED_SIZE_GADGET_YPOS-18, - "Playfield size:",FS_SMALL,FC_YELLOW); - XCopyArea(display,pix[PIX_DOOR],drawto,gc, - DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS, - DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS, - DXSIZE-4,ED_BUTTON_MINUS_YSIZE, - ED_SIZE_GADGET_XPOS, - ED_SIZE_GADGET_YPOS+0*ED_COUNT_GADGET_YSIZE); - XCopyArea(display,pix[PIX_DOOR],drawto,gc, - DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS, - DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS, - DXSIZE-4,ED_BUTTON_MINUS_YSIZE, - ED_SIZE_GADGET_XPOS, - ED_SIZE_GADGET_YPOS+1*ED_COUNT_GADGET_YSIZE); - DrawText(ED_SIZE_TEXT_XPOS,ED_SIZE_TEXT_YPOS+0*ED_SIZE_TEXT_YSIZE, - "Width",FS_SMALL,FC_YELLOW); - DrawText(ED_SIZE_TEXT_XPOS,ED_SIZE_TEXT_YPOS+1*ED_SIZE_TEXT_YSIZE, - "Height",FS_SMALL,FC_YELLOW); - DrawText(ED_SIZE_VALUE_XPOS,ED_SIZE_VALUE_YPOS+0*ED_SIZE_GADGET_YSIZE, - int2str(level.fieldx,3),FS_SMALL,FC_YELLOW); - DrawText(ED_SIZE_VALUE_XPOS,ED_SIZE_VALUE_YPOS+1*ED_SIZE_GADGET_YSIZE, - int2str(level.fieldy,3),FS_SMALL,FC_YELLOW); + int ed_xsize = lev_fieldx + 2; + int ed_ysize = lev_fieldy + 2; + int max_ed_fieldx = MAX_ED_FIELDX; + int max_ed_fieldy = MAX_ED_FIELDY; + boolean horizontal_scrollbar_needed; + boolean vertical_scrollbar_needed; + int x, y, width, height; + int xoffset, yoffset; + + /* check if we need any scrollbars */ + horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx); + vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy); + + /* check if we have a smaller editor field because of scrollbars */ + if (horizontal_scrollbar_needed) + max_ed_fieldy = MAX_ED_FIELDY - 1; + if (vertical_scrollbar_needed) + max_ed_fieldx = MAX_ED_FIELDX - 1; + + /* check again if we now need more scrollbars because of less space */ + horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx); + vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy); + + /* check if editor field gets even smaller after adding new scrollbars */ + if (horizontal_scrollbar_needed) + max_ed_fieldy = MAX_ED_FIELDY - 1; + if (vertical_scrollbar_needed) + max_ed_fieldx = MAX_ED_FIELDX - 1; + + ed_fieldx = (ed_xsize < MAX_ED_FIELDX ? ed_xsize : max_ed_fieldx); + ed_fieldy = (ed_ysize < MAX_ED_FIELDY ? ed_ysize : max_ed_fieldy); + + ModifyGadget(level_editor_gadget[GADGET_ID_DRAWING_LEVEL], + GDI_WIDTH, ed_fieldx * MINI_TILEX, + GDI_HEIGHT, ed_fieldy * MINI_TILEY, + GDI_AREA_SIZE, ed_fieldx, ed_fieldy, + GDI_END); + + xoffset = (ed_fieldx == MAX_ED_FIELDX ? ED_SCROLLBUTTON_XSIZE : 0); + yoffset = (ed_fieldy == MAX_ED_FIELDY ? ED_SCROLLBUTTON_YSIZE : 0); + + x = SX + scrollbutton_info[ED_SCROLLBUTTON_ID_AREA_RIGHT].x + xoffset; + y = SX + scrollbutton_info[ED_SCROLLBUTTON_ID_AREA_DOWN].y + yoffset; + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_RIGHT], GDI_X, x, GDI_END); + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_DOWN], GDI_Y, y, GDI_END); + + width = scrollbar_info[ED_SCROLLBAR_ID_HORIZONTAL].width + xoffset; + height = scrollbar_info[ED_SCROLLBAR_ID_VERTICAL].height + yoffset; + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL], + GDI_WIDTH, width, + GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldx, + GDI_END); + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL], + GDI_HEIGHT, height, + GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldy, + GDI_END); } -void AdjustLevelScrollPosition() +static void AdjustLevelScrollPosition() { if (level_xpos < -1) level_xpos = -1; - if (level_xpos > lev_fieldx - ED_FIELDX + 1) - level_xpos = lev_fieldx - ED_FIELDX + 1; - if (lev_fieldx < ED_FIELDX - 2) + if (level_xpos > lev_fieldx - ed_fieldx + 1) + level_xpos = lev_fieldx - ed_fieldx + 1; + if (lev_fieldx < ed_fieldx - 2) level_xpos = -1; if (level_ypos < -1) level_ypos = -1; - if (level_ypos > lev_fieldy - ED_FIELDY + 1) - level_ypos = lev_fieldy - ED_FIELDY + 1; - if (lev_fieldy < ED_FIELDY - 2) + if (level_ypos > lev_fieldy - ed_fieldy + 1) + level_ypos = lev_fieldy - ed_fieldy + 1; + if (lev_fieldy < ed_fieldy - 2) level_ypos = -1; } -void AdjustEditorScrollbar(int id) +static void AdjustEditorScrollbar(int id) { struct GadgetInfo *gi = level_editor_gadget[id]; - struct GadgetScrollbar *gs = &gi->scrollbar; - int items_max, items_visible, item_position = gs->item_position; + int items_max, items_visible, item_position; - if (id == ED_CTRL_ID_SCROLL_HORIZONTAL) + if (id == GADGET_ID_SCROLL_HORIZONTAL) { - items_max = lev_fieldx + 2; - items_visible = ED_FIELDX; + items_max = MAX(lev_fieldx + 2, ed_fieldx); + items_visible = ed_fieldx; + item_position = level_xpos + 1; } else { - items_max = lev_fieldy + 2; - items_visible = ED_FIELDY; + items_max = MAX(lev_fieldy + 2, ed_fieldy); + items_visible = ed_fieldy; + item_position = level_ypos + 1; } if (item_position > items_max - items_visible) item_position = items_max - items_visible; - AdjustScrollbar(gi, items_max, item_position); + ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max, + GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); +} + +static void ModifyEditorTextInput(int textinput_id, char *new_text) +{ + int gadget_id = textinput_info[textinput_id].gadget_id; + struct GadgetInfo *gi = level_editor_gadget[gadget_id]; + + ModifyGadget(gi, GDI_TEXT_VALUE, new_text, GDI_END); +} + +static void ModifyEditorCounter(int counter_id, int new_value) +{ + int *counter_value = *counterbutton_info[counter_id].counter_value; + int gadget_id = counterbutton_info[counter_id].gadget_id_text; + struct GadgetInfo *gi = level_editor_gadget[gadget_id]; + + ModifyGadget(gi, GDI_NUMBER_VALUE, new_value, GDI_END); + + if (counter_value != NULL) + *counter_value = gi->text.number_value; } static void PickDrawingElement(int button, int element) @@ -1496,715 +2009,207 @@ static void PickDrawingElement(int button, int element) redraw_mask |= REDRAW_DOOR_1; } -void LevelEd(int mx, int my, int button) +static void DrawDrawingWindow() { - static int last_button = 0; - static int in_field_pressed = FALSE; - static boolean use_floodfill = FALSE; + ClearWindow(); + UnmapLevelEditorWindowGadgets(); + AdjustDrawingAreaGadgets(); + AdjustLevelScrollPosition(); + AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL); + AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); + MapMainDrawingArea(); +} +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; + int x, y; - /* - int x = (mx-SX)/MINI_TILEX; - int y = (my-SY)/MINI_TILEY; - */ + ElementContent[0][0][0] = random_placement_background_element; - /* - HandlePressedControlButtons(); - HandleDrawingFunctions(mx, my, button); - */ + /* draw decorative border for the object */ + for (y=0; y<2; y++) + for (x=0; x<2; x++) + DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH); - if (use_floodfill) /********** FLOOD FILL **********/ - { + XFillRectangle(display, drawto, gc, + area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1, + MINI_TILEX + 2, MINI_TILEY + 2); + /* copy border to the right location */ + XCopyArea(display, drawto, drawto, gc, + area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY, + area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2); -#if 0 + DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); - if (button) - { - if (mx>=SX && mx=SY && mylev_fieldx || y>lev_fieldy || - (x==0 && level_xpos<0) || - (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) || - (y==0 && level_ypos<0) || - (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY)) - return; - - from_x = x+level_xpos; - from_y = y+level_ypos; - fill_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); - - FloodFill(from_x,from_y,fill_element); - DrawMiniLevel(level_xpos,level_ypos); - } + MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND); +} - use_floodfill = FALSE; - CloseDoor(DOOR_CLOSE_1); - OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); - } - return; +static void DrawLevelInfoWindow() +{ + char infotext[1024]; + int xoffset_above = 0; + int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE); + int xoffset_right = counter_xsize; + int yoffset_right = ED_BORDER_SIZE; + int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE; + int yoffset_right2 = ED_BORDER_SIZE; + int font_color = FC_GREEN; + int i, x, y; -#endif + ClearWindow(); + UnmapLevelEditorWindowGadgets(); + DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS, + "Level Settings", FS_BIG, FC_YELLOW); + DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS, + "Editor Settings", FS_BIG, FC_YELLOW); + gadget_level_xsize_value = &lev_fieldx; + gadget_level_ysize_value = &lev_fieldy; + gadget_level_random_value = &random_placement_value; + gadget_level_collect_value = &level.edelsteine; + gadget_level_timelimit_value = &level.time; + gadget_level_timescore_value = &level.score[10]; - } - else /********** EDIT/CTRL-FENSTER **********/ + /* draw counter gadgets */ + for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++) { - static unsigned long choice_delay = 0; - int choice = CheckElemButtons(mx,my,button); - int elem_pos = choice-ED_BUTTON_ELEM; - - if (((choice == ED_BUTTON_EUP && element_shift>0) || - (choice == ED_BUTTON_EDOWN && - element_shiftelements_in_list-MAX_ELEM_X*MAX_ELEM_Y) - element_shift = elements_in_list-MAX_ELEM_X*MAX_ELEM_Y; - if (element_shift % MAX_ELEM_X) - element_shift += MAX_ELEM_X-(element_shift % MAX_ELEM_X); - - for(i=0;i=0 && elem_pos=0) - { - if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) - break; - if (lev_fieldxlev_fieldx-ED_FIELDX+1) - level_xpos = lev_fieldx-ED_FIELDX+1; - if (button==1) - ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_LEFT); - else - DrawMiniLevel(level_xpos,level_ypos); - } - break; - case ED_BUTTON_UP: - if (level_ypos>=0) - { - if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) - break; - if (lev_fieldylev_fieldy-ED_FIELDY+1) - level_ypos = lev_fieldy-ED_FIELDY+1; - if (button==1) - ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_UP); - else - DrawMiniLevel(level_xpos,level_ypos); - } - break; - default: - break; - } - -#endif - - - -#if 0 - - if (mx>=SX && mx=SY && my3 || - (y==0 && level_ypos<0) || - (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY) || - (x==0 && level_xpos<0) || - (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) || - x>lev_fieldx || y>lev_fieldy) - return; - - new_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); - - if (new_element != Feld[x+level_xpos][y+level_ypos]) - { - if (new_element==EL_SPIELFIGUR) /* Jeder nur EINE Figur bitte... */ - { - int x,y; - - for(x=0;x=0 && x-level_xpos=0 && y-level_ypos= 0 && choice < 36 && - DelayReached(&choice_delay, GADGET_FRAME_DELAY)) - { - if (!(choice % 2)) - step = -step; - - choice /= 2; - - if (choice<11) - { - level.score[choice] += step; - if (level.score[choice]<0) - level.score[choice] = 0; - else if (level.score[choice]>255) - level.score[choice] = 255; - } - else if (choice==11) - { - level.tempo_amoebe += step; - if (level.tempo_amoebe<0) - level.tempo_amoebe = 0; - else if (level.tempo_amoebe>255) - level.tempo_amoebe = 255; - } - else if (choice==12) - { - level.dauer_sieb += step; - if (level.dauer_sieb<0) - level.dauer_sieb = 0; - else if (level.dauer_sieb>255) - level.dauer_sieb = 255; - } - else if (choice==13) - { - level.dauer_ablenk += step; - if (level.dauer_ablenk<0) - level.dauer_ablenk = 0; - else if (level.dauer_ablenk>255) - level.dauer_ablenk = 255; - } - else if (choice==14) - { - level.edelsteine += step; - if (level.edelsteine<0) - level.edelsteine = 0; - else if (level.edelsteine>999) - level.edelsteine = 999; - } - else if (choice==15) - { - level.time += step; - if (level.time<0) - level.time = 0; - else if (level.time>999) - level.time = 999; - } - else if (choice==16) - { - lev_fieldx += step; - if (lev_fieldxMAX_LEV_FIELDX) - lev_fieldx = MAX_LEV_FIELDX; - level.fieldx = lev_fieldx; - } - else if (choice==17) - { - lev_fieldy += step; - if (lev_fieldyMAX_LEV_FIELDY) - lev_fieldy = MAX_LEV_FIELDY; - level.fieldy = lev_fieldy; - } - - if (choice<11) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE, - int2str(level.score[choice],3),FS_SMALL,FC_YELLOW); - else if (choice==11) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+11*ED_COUNT_GADGET_YSIZE, - int2str(level.tempo_amoebe,3),FS_SMALL,FC_YELLOW); - else if (choice==12) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+12*ED_COUNT_GADGET_YSIZE, - int2str(level.dauer_sieb,3),FS_SMALL,FC_YELLOW); - else if (choice==13) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+13*ED_COUNT_GADGET_YSIZE, - int2str(level.dauer_ablenk,3),FS_SMALL,FC_YELLOW); - else if (choice==14) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+14*ED_COUNT_GADGET_YSIZE, - int2str(level.edelsteine,3),FS_SMALL,FC_YELLOW); - else if (choice==15) - DrawText(ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+15*ED_COUNT_GADGET_YSIZE, - int2str(level.time,3),FS_SMALL,FC_YELLOW); - else if (choice==16) - DrawText(ED_SIZE_VALUE_XPOS, - ED_SIZE_VALUE_YPOS+0*ED_SIZE_GADGET_YSIZE, - int2str(level.fieldx,3),FS_SMALL,FC_YELLOW); - else if (choice==17) - DrawText(ED_SIZE_VALUE_XPOS, - ED_SIZE_VALUE_YPOS+1*ED_SIZE_GADGET_YSIZE, - int2str(level.fieldy,3),FS_SMALL,FC_YELLOW); - - redraw_mask &= ~REDRAW_FIELD; - if (choice<16) - XCopyArea(display,drawto,window,gc, - ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE, - 3*FONT2_XSIZE,FONT2_YSIZE, - ED_COUNT_VALUE_XPOS, - ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE); - else - XCopyArea(display,drawto,window,gc, - ED_SIZE_VALUE_XPOS, - ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE, - 3*FONT2_XSIZE,FONT2_YSIZE, - ED_SIZE_VALUE_XPOS, - ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE); - XFlush(display); - } - - - -#if 0 - - switch(CheckCtrlButtons(mx,my,button)) - { - case ED_BUTTON_EDIT: - CloseDoor(DOOR_CLOSE_2); - AdjustLevelScrollPosition(); - DrawMiniLevel(level_xpos,level_ypos); - XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY2, - VXSIZE,VYSIZE, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2); - OpenDoor(DOOR_OPEN_2); - edit_mode = ED_MODE_DRAWING; - break; - case ED_BUTTON_CLEAR: - if (Request("Are you sure to clear this level ?",REQ_ASK)) - { - for(x=0;x=ED_COUNT_GADGET_XPOS && - mx=ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE && - my=SX+29*MINI_TILEX && mx=SY+26*MINI_TILEY && my3) - return; + /* 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; - new_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); + sprintf(infotext, "%s:", textinput_info[i].infotext); + infotext[MAX_INFOTEXT_LEN] = '\0'; - if (new_element != level.amoebe_inhalt) - { - level.amoebe_inhalt = new_element; - DrawMiniElement(29,26,new_element); - } - } + DrawTextF(x, y, font_color, infotext); + ModifyEditorTextInput(i, textinput_info[i].value); + MapTextInputGadget(i); + } - if (mx>=SX+1*MINI_TILEX && mx=SY+2*MINI_TILEY && my=0 && i<43 && x>=0 && x<3 && y>=0 && y<3) - { - if (button && !motion_status) - in_field_pressed = TRUE; + x = radiobutton_info[i].x + xoffset_right2; + y = radiobutton_info[i].y + yoffset_right2; - if (!button || !in_field_pressed || button<1 || button>3) - return; + DrawTextF(x, y, font_color, radiobutton_info[i].text); + ModifyGadget(level_editor_gadget[radiobutton_info[i].gadget_id], + GDI_CHECKED, checked, GDI_END); + MapRadiobuttonGadget(i); + } - new_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); + /* 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; - if (new_element != level.mampfer_inhalt[i][x][y]) - { - level.mampfer_inhalt[i][x][y] = new_element; - DrawMiniElement(1+5*i+x,2+y,new_element); - } - } - else if (!motion_status)/* Mauszeiger nicht im Cruncher-Feld */ - in_field_pressed = FALSE; - } - else if (!motion_status) /* Mauszeiger nicht im Cruncher-Feld */ - in_field_pressed = FALSE; - } + DrawTextF(x, y, font_color, checkbutton_info[i].text); + ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], + GDI_CHECKED, *checkbutton_info[i].value, GDI_END); + MapCheckbuttonGadget(i); } - last_button = button; - - BackToFront(); + /* draw drawing area */ + DrawRandomPlacementBackgroundArea(); } -void LevelNameTyping(KeySym key) +static void DrawAmoebaContentArea() { - unsigned char ascii = 0; - int len = strlen(level.name); + 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 font_color = FC_GREEN; + int x, y; - if (!name_typing) - return; + ElementContent[0][0][0] = level.amoebe_inhalt; - if (key>=XK_A && key<=XK_Z) - ascii = 'A'+(char)(key-XK_A); - else if (key>=XK_a && key<=XK_z) - ascii = 'a'+(char)(key-XK_a); - else if (key>=XK_0 && key<=XK_9) - ascii = '0'+(char)(key-XK_0); -#ifdef XK_LATIN1 - else if (key>=XK_space && key<=XK_at) - ascii = ' '+(char)(key-XK_space); - else if (key==XK_Adiaeresis) - ascii = 'Ä'; - else if (key==XK_Odiaeresis) - ascii = 'Ö'; - else if (key==XK_Udiaeresis) - ascii = 'Ü'; - else if (key==XK_adiaeresis) - ascii = 'ä'; - else if (key==XK_odiaeresis) - ascii = 'ö'; - else if (key==XK_udiaeresis) - ascii = 'ü'; - else if (key==XK_underscore) - ascii = '_'; -#endif + /* draw decorative border for the object */ + for (y=0; y<2; y++) + for (x=0; x<2; x++) + DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH); - if (ascii && len0) - { - level.name[len-1] = 0; - len--; - - DrawTextExt(drawto,gc, - ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - "< ",FS_SMALL,FC_GREEN); - DrawTextExt(window,gc, - ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - "< ",FS_SMALL,FC_GREEN); - } - else if (key==XK_Return) - { - DrawTextExt(drawto,gc, - ED_COUNT_GADGET_XPOS+5, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - level.name,FS_SMALL,FC_YELLOW); - DrawTextExt(window,gc, - ED_COUNT_GADGET_XPOS+5, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - level.name,FS_SMALL,FC_YELLOW); - DrawTextExt(drawto,gc, - ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - " ",FS_SMALL,FC_YELLOW); - DrawTextExt(window,gc, - ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE, - ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE, - " ",FS_SMALL,FC_YELLOW); - - name_typing = FALSE; - } -} + XFillRectangle(display, drawto, gc, + area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1, + MINI_TILEX + 2, MINI_TILEY + 2); -static void DrawCounterValueField(int counter_id, int value) -{ - int x = SX + counterbutton_info[counter_id].x + ED_WIN_COUNT_XPOS; - int y = SY + counterbutton_info[counter_id].y; + /* copy border to the right location */ + XCopyArea(display, drawto, drawto, gc, + area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY, + area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2); - XCopyArea(display, pix[PIX_DOOR], drawto, gc, - DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS, - DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS, - ED_WIN_COUNT_XSIZE, ED_WIN_COUNT_YSIZE, - x, y); + DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", + FS_SMALL, font_color); - DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET, - int2str(value, 3), FS_SMALL, FC_YELLOW); -} + DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); -static void DrawDrawingWindow() -{ - ClearWindow(); - UnmapLevelEditorWindowGadgets(); - AdjustLevelScrollPosition(); - AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_HORIZONTAL); - AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_VERTICAL); - DrawMiniLevel(level_xpos, level_ypos); - MapMainDrawingArea(); + MapDrawingArea(GADGET_ID_AMOEBA_CONTENT); } static void DrawElementContentAreas() { int *num_areas = &MampferMax; - int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX; - int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY; - int area_sx = SX + ED_AREA_ELEMCONT_XPOS; - int area_sy = SY + ED_AREA_ELEMCONT_YPOS; + 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 = counter_xsize; + int yoffset_right = ED_BORDER_SIZE; + int font_color = FC_GREEN; int i, x, y; - for (i=0; i from_x ? +1 : -1); + int to_y = to_y2 - (to_y2 > from_y ? +1 : -1); + int len_x = ABS(to_x - from_x); + int len_y = ABS(to_y - from_y); + int radius, x, y; + + radius = (int)(sqrt((float)(len_x * len_x + len_y * len_y)) + 0.5); + + /* not optimal (some points get drawn twice) but simple, + and fast enough for the few points we are drawing */ + + for (x=0; x<=radius; x++) + { + int sx, sy, lx, ly; + + y = (int)(sqrt((float)(radius * radius - x * x)) + 0.5); + + sx = from_x + x * (from_x < to_x2 ? +1 : -1); + sy = from_y + y * (from_y < to_y2 ? +1 : -1); + lx = sx + level_xpos; + ly = sy + level_ypos; + + if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly)) + DrawLineElement(sx, sy, element, change_level); + } + + for (y=0; y<=radius; y++) + { + int sx, sy, lx, ly; + + x = (int)(sqrt((float)(radius * radius - y * y)) + 0.5); + + sx = from_x + x * (from_x < to_x2 ? +1 : -1); + sy = from_y + y * (from_y < to_y2 ? +1 : -1); + lx = sx + level_xpos; + ly = sy + level_ypos; + + if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly)) + DrawLineElement(sx, sy, element, change_level); + } +} + +static void DrawArc(int from_x, int from_y, int to_x, int to_y, + int element, boolean change_level) +{ + int to_x2 = to_x + (to_x < from_x ? -1 : +1); + int to_y2 = to_y + (to_y > from_y ? +1 : -1); + + DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level); +} + +#define DRAW_CIRCLES_BUTTON_AVAILABLE 0 +#if DRAW_CIRCLES_BUTTON_AVAILABLE +static void DrawCircle(int from_x, int from_y, int to_x, int to_y, + int element, boolean change_level) +{ + int to_x2 = to_x + (to_x < from_x ? -1 : +1); + int to_y2 = to_y + (to_y > from_y ? +1 : -1); + int mirror_to_x2 = from_x - (to_x2 - from_x); + int mirror_to_y2 = from_y - (to_y2 - from_y); + + DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level); + DrawArcExt(from_x, from_y, mirror_to_x2, to_y2, element, change_level); + DrawArcExt(from_x, from_y, to_x2, mirror_to_y2, element, change_level); + DrawArcExt(from_x, from_y, mirror_to_x2, mirror_to_y2, element,change_level); +} +#endif + static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y) { int from_sx, from_sy; @@ -2570,7 +2647,7 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y, static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, int button, int mode) { - static short brush_buffer[ED_FIELDX][ED_FIELDY]; + static short brush_buffer[MAX_ED_FIELDX][MAX_ED_FIELDY]; static int brush_width, brush_height; static int last_cursor_x = -1, last_cursor_y = -1; static boolean delete_old_brush; @@ -2629,7 +2706,8 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, if (mode != CB_DELETE_OLD_CURSOR && delete_old_brush) CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR); - if (!IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos)) + if (!IN_ED_FIELD(cursor_x, cursor_y) || + !IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos)) { delete_old_brush = FALSE; return; @@ -2648,8 +2726,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, mode == CB_BRUSH_TO_CURSOR || button == 1 ? brush_buffer[x][y] : new_element); - if (IN_LEV_FIELD(lx, ly) && - sx >=0 && sx < ED_FIELDX && sy >=0 && sy < ED_FIELDY) + if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly)) { if (sx < border_from_x) border_from_x = sx; @@ -2737,21 +2814,22 @@ static void FloodFill(int from_x, int from_y, int fill_element) } /* values for DrawLevelText() modes */ -#define TEXT_INIT 0 -#define TEXT_SETCURSOR 1 -#define TEXT_WRITECHAR 2 -#define TEXT_BACKSPACE 3 -#define TEXT_NEWLINE 4 -#define TEXT_END 5 - -static void DrawLevelText(int sx, int sy, char letter, int mode) +#define TEXT_INIT 0 +#define TEXT_SETCURSOR 1 +#define TEXT_WRITECHAR 2 +#define TEXT_BACKSPACE 3 +#define TEXT_NEWLINE 4 +#define TEXT_END 5 +#define TEXT_QUERY_TYPING 6 + +static int DrawLevelText(int sx, int sy, char letter, int mode) { static short delete_buffer[MAX_LEV_FIELDX]; static int start_sx, start_sy; static int last_sx, last_sy; static boolean typing = FALSE; int letter_element = EL_CHAR_ASCII0 + letter; - int lx, ly; + int lx = 0, ly = 0; /* map lower case letters to upper case and convert special characters */ if (letter >= 'a' && letter <= 'z') @@ -2770,7 +2848,7 @@ static void DrawLevelText(int sx, int sy, char letter, int mode) if (mode != TEXT_INIT) { if (!typing) - return; + return FALSE; if (mode != TEXT_SETCURSOR) { @@ -2807,9 +2885,9 @@ static void DrawLevelText(int sx, int sy, char letter, int mode) delete_buffer[sx - start_sx] = Feld[lx][ly]; Feld[lx][ly] = letter_element; - if (sx + 1 < ED_FIELDX && lx + 1 < lev_fieldx) + if (sx + 1 < ed_fieldx && lx + 1 < lev_fieldx) DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR); - else if (sy + 1 < ED_FIELDY && ly + 1 < lev_fieldy) + else if (sy + 1 < ed_fieldy && ly + 1 < lev_fieldy) DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR); else DrawLevelText(0, 0, 0, TEXT_END); @@ -2820,13 +2898,13 @@ static void DrawLevelText(int sx, int sy, char letter, int mode) if (sx > start_sx) { Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1]; - DrawMiniElement(sx - 1, sy, new_element3); + DrawMiniElement(sx - 1, sy, Feld[lx - 1][ly]); DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR); } break; case TEXT_NEWLINE: - if (sy + 1 < ED_FIELDY - 1 && ly + 1 < lev_fieldy - 1) + if (sy + 1 < ed_fieldy - 1 && ly + 1 < lev_fieldy - 1) DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR); else DrawLevelText(0, 0, 0, TEXT_END); @@ -2838,9 +2916,14 @@ static void DrawLevelText(int sx, int sy, char letter, int mode) typing = FALSE; break; + case TEXT_QUERY_TYPING: + break; + default: break; } + + return typing; } static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy, @@ -2859,6 +2942,7 @@ static void CopyLevelToUndoBuffer(int mode) { static boolean accumulated_undo = FALSE; boolean new_undo_buffer_position = TRUE; + int last_border_element; int x, y; switch (mode) @@ -2889,6 +2973,13 @@ static void CopyLevelToUndoBuffer(int mode) for(x=0; x= num_free_positions) { - for(x=0; x 0) { - int elements_left = random_placement_num_objects; + x = RND(lev_fieldx); + y = RND(lev_fieldy); - while (elements_left > 0) + /* don't place element at the same position twice */ + if (free_position[x][y]) { - x = RND(lev_fieldx); - y = RND(lev_fieldy); - - if (Feld[x][y] != new_element) - { - Feld[x][y] = new_element; - elements_left--; - } + free_position[x][y] = FALSE; + Feld[x][y] = new_element; + num_elements--; } } - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); CopyLevelToUndoBuffer(UNDO_IMMEDIATE); } @@ -2948,7 +3057,7 @@ void WrapLevel(int dx, int dy) Feld[x][y] = FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy]; - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); CopyLevelToUndoBuffer(UNDO_ACCUMULATE); } @@ -2956,16 +3065,17 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) { static boolean started_inside_drawing_area = FALSE; int id = gi->custom_id; - boolean inside_drawing_area = !gi->event.off_borders; boolean button_press_event; boolean button_release_event; - boolean draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL); - int new_element; + boolean inside_drawing_area = !gi->event.off_borders; + boolean draw_level = (id == GADGET_ID_DRAWING_LEVEL); + int actual_drawing_function; int button = gi->event.button; + int new_element = BUTTON_ELEMENT(button); int sx = gi->event.x, sy = gi->event.y; int min_sx = 0, min_sy = 0; int max_sx = gi->drawing.area_xsize - 1, max_sy = gi->drawing.area_ysize - 1; - int lx, ly; + int lx = 0, ly = 0; int min_lx = 0, min_ly = 0; int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1; int x, y; @@ -2991,6 +3101,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) lx = sx + level_xpos; ly = sy + level_ypos; + if (!IN_LEV_FIELD(lx, ly)) + inside_drawing_area = FALSE; + /* make sure to stay inside level field boundaries */ lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx); ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly); @@ -3009,26 +3122,43 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) if (!button && !button_release_event) return; - new_element = (button == 1 ? new_element1 : - button == 2 ? new_element2 : - button == 3 ? new_element3 : 0); - if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS) +#if 0 + if (button_release_event) + button = 0; +#endif + +#if 0 + if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS) return; +#endif + + /* automatically switch to 'single item' drawing mode, if needed */ + actual_drawing_function = + (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS); - switch (drawing_function) + switch (actual_drawing_function) { - case ED_CTRL_ID_SINGLE_ITEMS: + case GADGET_ID_SINGLE_ITEMS: if (draw_level) { if (button_release_event) + { CopyLevelToUndoBuffer(UNDO_IMMEDIATE); + if (edit_mode == ED_MODE_DRAWING && draw_with_brush && + !inside_drawing_area) + DeleteBrushFromCursor(); + } + if (!button) break; if (draw_with_brush) - CopyBrushToLevel(sx, sy, button); + { + if (!button_release_event) + CopyBrushToLevel(sx, sy, button); + } else if (new_element != Feld[lx][ly]) { if (new_element == EL_SPIELFIGUR) @@ -3041,8 +3171,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1) { Feld[x][y] = EL_LEERRAUM; - if (x - level_xpos >= 0 && x - level_xpos < ED_FIELDX && - y - level_ypos >= 0 && y - level_ypos < ED_FIELDY) + if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx && + y - level_ypos >= 0 && y - level_ypos < ed_fieldy) DrawMiniElement(x - level_xpos, y - level_ypos, EL_LEERRAUM); } @@ -3065,15 +3195,18 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) gi->y + sy * MINI_TILEY, el2gfx(new_element)); - if (id == ED_CTRL_ID_AMOEBA_CONTENT) + if (id == GADGET_ID_AMOEBA_CONTENT) level.amoebe_inhalt = new_element; - else if (id >= ED_CTRL_ID_ELEMCONT_0 && id <= ED_CTRL_ID_ELEMCONT_7) - level.mampfer_inhalt[id - ED_CTRL_ID_ELEMCONT_0][sx][sy] = + else if (id == GADGET_ID_RANDOM_BACKGROUND) + random_placement_background_element = new_element; + else if (id >= GADGET_ID_ELEM_CONTENT_0 && + id <= GADGET_ID_ELEM_CONTENT_7) + level.mampfer_inhalt[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] = new_element; } break; - case ED_CTRL_ID_CONNECTED_ITEMS: + case GADGET_ID_CONNECTED_ITEMS: { static int last_sx = -1; static int last_sy = -1; @@ -3092,11 +3225,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } break; - case ED_CTRL_ID_LINE: - case ED_CTRL_ID_RECTANGLE: - case ED_CTRL_ID_FILLED_BOX: - case ED_CTRL_ID_GRAB_BRUSH: - case ED_CTRL_ID_TEXT: + case GADGET_ID_LINE: + case GADGET_ID_ARC: + case GADGET_ID_RECTANGLE: + case GADGET_ID_FILLED_BOX: + case GADGET_ID_GRAB_BRUSH: + case GADGET_ID_TEXT: { static int last_sx = -1; static int last_sy = -1; @@ -3104,15 +3238,17 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) static int start_sy = -1; void (*draw_func)(int, int, int, int, int, boolean); - if (drawing_function == ED_CTRL_ID_LINE) + if (drawing_function == GADGET_ID_LINE) draw_func = DrawLine; - else if (drawing_function == ED_CTRL_ID_RECTANGLE) + else if (drawing_function == GADGET_ID_ARC) + draw_func = DrawArc; + else if (drawing_function == GADGET_ID_RECTANGLE) draw_func = DrawRectangle; - else if (drawing_function == ED_CTRL_ID_FILLED_BOX) + else if (drawing_function == GADGET_ID_FILLED_BOX) draw_func = DrawFilledBox; - else if (drawing_function == ED_CTRL_ID_GRAB_BRUSH) + else if (drawing_function == GADGET_ID_GRAB_BRUSH) draw_func = SelectArea; - else /* (drawing_function == ED_CTRL_ID_TEXT) */ + else /* (drawing_function == GADGET_ID_TEXT) */ draw_func = SetTextCursor; if (button_press_event) @@ -3121,20 +3257,20 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) start_sx = last_sx = sx; start_sy = last_sy = sy; - if (drawing_function == ED_CTRL_ID_TEXT) + if (drawing_function == GADGET_ID_TEXT) DrawLevelText(0, 0, 0, TEXT_END); } else if (button_release_event) { draw_func(start_sx, start_sy, sx, sy, new_element, TRUE); - if (drawing_function == ED_CTRL_ID_GRAB_BRUSH) + if (drawing_function == GADGET_ID_GRAB_BRUSH) { CopyAreaToBrush(start_sx, start_sy, sx, sy, button); CopyBrushToCursor(sx, sy); - ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]); + ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],MB_LEFT); draw_with_brush = TRUE; } - else if (drawing_function == ED_CTRL_ID_TEXT) + else if (drawing_function == GADGET_ID_TEXT) DrawLevelText(sx, sy, 0, TEXT_INIT); else CopyLevelToUndoBuffer(UNDO_IMMEDIATE); @@ -3149,38 +3285,27 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } break; - - -#if 0 - case ED_CTRL_ID_TEXT: - /* - DrawMiniElement(last_sx, last_sy, Feld[lx][ly]); - DrawAreaBorder(sx, sy, sx, sy); - last_sx = sx; - last_sy = sy; - */ - - if (button_press_event) - DrawLevelText(sx, sy, 0, TEXT_INIT); - break; -#endif - - - - case ED_CTRL_ID_FLOOD_FILL: + case GADGET_ID_FLOOD_FILL: if (button_press_event && Feld[lx][ly] != new_element) { FloodFill(lx, ly, new_element); - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); CopyLevelToUndoBuffer(UNDO_IMMEDIATE); } break; - case ED_CTRL_ID_PICK_ELEMENT: + case GADGET_ID_PICK_ELEMENT: + + /* if (button_press_event) PickDrawingElement(button, Feld[lx][ly]); + */ + if (button_release_event) - ClickOnGadget(level_editor_gadget[last_drawing_function]); + ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT); + else + PickDrawingElement(button, Feld[lx][ly]); + break; default: @@ -3196,27 +3321,109 @@ static void HandleCounterButtons(struct GadgetInfo *gi) switch (id) { - case ED_CTRL_ID_SCORE_DOWN: - case ED_CTRL_ID_SCORE_UP: - *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step); - if (*gadget_score_value < 0) - *gadget_score_value = 0; - else if (*gadget_score_value > 255) - *gadget_score_value = 255; + case GADGET_ID_ELEM_SCORE_DOWN: + case GADGET_ID_ELEM_SCORE_UP: + step *= (id == GADGET_ID_ELEM_SCORE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, + *gadget_elem_score_value + step); + break; + case GADGET_ID_ELEM_SCORE_TEXT: + *gadget_elem_score_value = gi->text.number_value; + break; + + case GADGET_ID_ELEM_CONTENT_DOWN: + case GADGET_ID_ELEM_CONTENT_UP: + step *= (id == GADGET_ID_ELEM_CONTENT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, + *gadget_elem_content_value + step); + DrawElementContentAreas(); + break; + case GADGET_ID_ELEM_CONTENT_TEXT: + *gadget_elem_content_value = gi->text.number_value; + DrawElementContentAreas(); + break; + + case GADGET_ID_LEVEL_XSIZE_DOWN: + case GADGET_ID_LEVEL_XSIZE_UP: + step *= (id == GADGET_ID_LEVEL_XSIZE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE, + *gadget_level_xsize_value + step); + level.fieldx = lev_fieldx; + break; + case GADGET_ID_LEVEL_XSIZE_TEXT: + *gadget_level_xsize_value = gi->text.number_value; + level.fieldx = lev_fieldx; + break; - DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value); + case GADGET_ID_LEVEL_YSIZE_DOWN: + case GADGET_ID_LEVEL_YSIZE_UP: + step *= (id == GADGET_ID_LEVEL_YSIZE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE, + *gadget_level_ysize_value + step); + level.fieldy = lev_fieldy; + break; + case GADGET_ID_LEVEL_YSIZE_TEXT: + *gadget_level_ysize_value = gi->text.number_value; + level.fieldy = lev_fieldy; break; - case ED_CTRL_ID_ELEMCONT_DOWN: - case ED_CTRL_ID_ELEMCONT_UP: - *gadget_areas_value += (id == ED_CTRL_ID_ELEMCONT_DOWN ? -step : step); - if (*gadget_areas_value < 1) - *gadget_areas_value = 1; - else if (*gadget_areas_value > MAX_ELEMCONT) - *gadget_areas_value = MAX_ELEMCONT; + case GADGET_ID_LEVEL_RANDOM_DOWN: + case GADGET_ID_LEVEL_RANDOM_UP: + step *= (id == GADGET_ID_LEVEL_RANDOM_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM, + *gadget_level_random_value + step); + break; + case GADGET_ID_LEVEL_RANDOM_TEXT: + *gadget_level_random_value = gi->text.number_value; + break; - DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value); - DrawElementContentAreas(); + case GADGET_ID_LEVEL_COLLECT_DOWN: + case GADGET_ID_LEVEL_COLLECT_UP: + step *= (id == GADGET_ID_LEVEL_COLLECT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT, + *gadget_level_collect_value + step); + break; + case GADGET_ID_LEVEL_COLLECT_TEXT: + *gadget_level_collect_value = gi->text.number_value; + break; + + case GADGET_ID_LEVEL_TIMELIMIT_DOWN: + case GADGET_ID_LEVEL_TIMELIMIT_UP: + step *= (id == GADGET_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT, + *gadget_level_timelimit_value + step); + break; + case GADGET_ID_LEVEL_TIMELIMIT_TEXT: + *gadget_level_timelimit_value = gi->text.number_value; + break; + + case GADGET_ID_LEVEL_TIMESCORE_DOWN: + case GADGET_ID_LEVEL_TIMESCORE_UP: + step *= (id == GADGET_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE, + *gadget_level_timescore_value + step); + break; + case GADGET_ID_LEVEL_TIMESCORE_TEXT: + *gadget_level_timescore_value = gi->text.number_value; + break; + + default: + break; + } +} + +static void HandleTextInputGadgets(struct GadgetInfo *gi) +{ + int id = gi->custom_id; + + switch (id) + { + case GADGET_ID_LEVEL_NAME: + strcpy(level.name, gi->text.value); + break; + + case GADGET_ID_LEVEL_AUTHOR: + strcpy(level.author, gi->text.value); break; default: @@ -3229,19 +3436,15 @@ static void HandleControlButtons(struct GadgetInfo *gi) int id = gi->custom_id; int button = gi->event.button; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); - int new_element; + int new_element = BUTTON_ELEMENT(button); int player_present = FALSE; int level_changed = FALSE; - int x, y; - - new_element = (button == 1 ? new_element1 : - button == 2 ? new_element2 : - button == 3 ? new_element3 : 0); + int i, x, y; - if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT) + if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT) DrawLevelText(0, 0, 0, TEXT_END); - if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES && + if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES && edit_mode != ED_MODE_DRAWING) { DrawDrawingWindow(); @@ -3250,14 +3453,13 @@ static void HandleControlButtons(struct GadgetInfo *gi) switch (id) { - case ED_CTRL_ID_SCROLL_LEFT: + case GADGET_ID_SCROLL_LEFT: if (level_xpos >= 0) { - int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL; + int gadget_id = GADGET_ID_SCROLL_HORIZONTAL; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - struct GadgetScrollbar *gs = &gi->scrollbar; - if (lev_fieldx < ED_FIELDX - 2) + if (lev_fieldx < ed_fieldx - 2) break; level_xpos -= step; @@ -3266,42 +3468,40 @@ static void HandleControlButtons(struct GadgetInfo *gi) if (button == 1) ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT); else - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); - AdjustScrollbar(gi, gs->items_max, level_xpos + 1); + ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END); } break; - case ED_CTRL_ID_SCROLL_RIGHT: - if (level_xpos <= lev_fieldx - ED_FIELDX) + case GADGET_ID_SCROLL_RIGHT: + if (level_xpos <= lev_fieldx - ed_fieldx) { - int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL; + int gadget_id = GADGET_ID_SCROLL_HORIZONTAL; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - struct GadgetScrollbar *gs = &gi->scrollbar; - if (lev_fieldx < ED_FIELDX - 2) + if (lev_fieldx < ed_fieldx - 2) break; level_xpos += step; - if (level_xpos > lev_fieldx - ED_FIELDX + 1) - level_xpos = lev_fieldx - ED_FIELDX + 1; + if (level_xpos > lev_fieldx - ed_fieldx + 1) + level_xpos = lev_fieldx - ed_fieldx + 1; if (button == 1) ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT); else - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); - AdjustScrollbar(gi, gs->items_max, level_xpos + 1); + ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END); } break; - case ED_CTRL_ID_SCROLL_UP: + case GADGET_ID_SCROLL_UP: if (level_ypos >= 0) { - int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL; + int gadget_id = GADGET_ID_SCROLL_VERTICAL; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - struct GadgetScrollbar *gs = &gi->scrollbar; - if (lev_fieldy < ED_FIELDY - 2) + if (lev_fieldy < ed_fieldy - 2) break; level_ypos -= step; @@ -3310,79 +3510,103 @@ static void HandleControlButtons(struct GadgetInfo *gi) if (button == 1) ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN); else - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); - AdjustScrollbar(gi, gs->items_max, level_ypos + 1); + ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END); } break; - case ED_CTRL_ID_SCROLL_DOWN: - if (level_ypos <= lev_fieldy - ED_FIELDY) + case GADGET_ID_SCROLL_DOWN: + if (level_ypos <= lev_fieldy - ed_fieldy) { - int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL; + int gadget_id = GADGET_ID_SCROLL_VERTICAL; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - struct GadgetScrollbar *gs = &gi->scrollbar; - if (lev_fieldy < ED_FIELDY - 2) + if (lev_fieldy < ed_fieldy - 2) break; level_ypos += step; - if (level_ypos > lev_fieldy - ED_FIELDY + 1) - level_ypos = lev_fieldy - ED_FIELDY + 1; + if (level_ypos > lev_fieldy - ed_fieldy + 1) + level_ypos = lev_fieldy - ed_fieldy + 1; if (button == 1) ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP); else - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); - AdjustScrollbar(gi, gs->items_max, level_ypos + 1); + ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END); } break; - case ED_CTRL_ID_SCROLL_HORIZONTAL: + case GADGET_ID_SCROLL_HORIZONTAL: level_xpos = gi->event.item_position - 1; - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); break; - case ED_CTRL_ID_SCROLL_VERTICAL: + case GADGET_ID_SCROLL_VERTICAL: level_ypos = gi->event.item_position - 1; - DrawMiniLevel(level_xpos, level_ypos); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); + break; + + case GADGET_ID_ELEMENTLIST_UP: + case GADGET_ID_ELEMENTLIST_DOWN: + step *= (id == GADGET_ID_ELEMENTLIST_UP ? -1 : +1); + element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ; + + if (element_shift < 0) + element_shift = 0; + if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS) + element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS; + + for (i=0; ideco.design; + int element = editor_element[element_shift + i]; + + UnmapGadget(gi); + getMiniGraphicSource(el2gfx(element), &gd->pixmap, &gd->x, &gd->y); + ModifyGadget(gi, GDI_INFO_TEXT, element_info[element], GDI_END); + MapGadget(gi); + } break; - case ED_CTRL_ID_WRAP_LEFT: + case GADGET_ID_WRAP_LEFT: WrapLevel(-step, 0); break; - case ED_CTRL_ID_WRAP_RIGHT: + case GADGET_ID_WRAP_RIGHT: WrapLevel(step, 0); break; - case ED_CTRL_ID_WRAP_UP: + case GADGET_ID_WRAP_UP: WrapLevel(0, -step); break; - case ED_CTRL_ID_WRAP_DOWN: + case GADGET_ID_WRAP_DOWN: WrapLevel(0, step); break; - case ED_CTRL_ID_SINGLE_ITEMS: - case ED_CTRL_ID_CONNECTED_ITEMS: - case ED_CTRL_ID_LINE: - case ED_CTRL_ID_TEXT: - case ED_CTRL_ID_RECTANGLE: - case ED_CTRL_ID_FILLED_BOX: - case ED_CTRL_ID_FLOOD_FILL: - case ED_CTRL_ID_GRAB_BRUSH: - case ED_CTRL_ID_PICK_ELEMENT: + case GADGET_ID_SINGLE_ITEMS: + case GADGET_ID_CONNECTED_ITEMS: + case GADGET_ID_LINE: + case GADGET_ID_ARC: + case GADGET_ID_TEXT: + case GADGET_ID_RECTANGLE: + case GADGET_ID_FILLED_BOX: + case GADGET_ID_FLOOD_FILL: + case GADGET_ID_GRAB_BRUSH: + case GADGET_ID_PICK_ELEMENT: last_drawing_function = drawing_function; drawing_function = id; draw_with_brush = FALSE; break; - case ED_CTRL_ID_RANDOM_PLACEMENT: - RandomPlacement(button); + case GADGET_ID_RANDOM_PLACEMENT: + RandomPlacement(new_element); break; - case ED_CTRL_ID_PROPERTIES: + case GADGET_ID_PROPERTIES: if (edit_mode != ED_MODE_PROPERTIES) { properties_element = new_element; @@ -3396,7 +3620,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) } break; - case ED_CTRL_ID_UNDO: + case GADGET_ID_UNDO: if (undo_buffer_steps == 0) { Request("Undo buffer empty !", REQ_CONFIRM); @@ -3410,13 +3634,13 @@ static void HandleControlButtons(struct GadgetInfo *gi) for(x=0; xevent.type == GD_EVENT_PRESSED) - printf("default: HandleControlButtons: GD_EVENT_PRESSED\n"); - else if (gi->event.type == GD_EVENT_RELEASED) - printf("default: HandleControlButtons: GD_EVENT_RELEASED\n"); - else if (gi->event.type == GD_EVENT_MOVING) - printf("default: HandleControlButtons: GD_EVENT_MOVING\n"); - else - printf("default: HandleControlButtons: ?\n"); -#endif + case GADGET_ID_RANDOM_PERCENTAGE: + *radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].value = + radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].checked_value; break; - } -} - -void HandleLevelEditorKeyInput(KeySym key) -{ - if (edit_mode == ED_MODE_DRAWING) - { - char letter = getCharFromKeySym(key); - if (drawing_function == ED_CTRL_ID_TEXT) - { - if (letter) - DrawLevelText(0, 0, letter, TEXT_WRITECHAR); - else if (key == XK_Delete || key == XK_BackSpace) - DrawLevelText(0, 0, 0, TEXT_BACKSPACE); - else if (key == XK_Return) - DrawLevelText(0, 0, 0, TEXT_NEWLINE); - } - else if (button_status == MB_RELEASED) - { - int id; + case GADGET_ID_RANDOM_QUANTITY: + *radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].value = + radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].checked_value; + break; - switch (letter) - { - case '.': - case 's': - id = ED_CTRL_ID_SINGLE_ITEMS; - break; - case 'd': - id = ED_CTRL_ID_CONNECTED_ITEMS; - break; - case 'l': - id = ED_CTRL_ID_LINE; - break; - case 't': - id = ED_CTRL_ID_TEXT; - break; - case 'r': - id = ED_CTRL_ID_RECTANGLE; - break; - case 'R': - id = ED_CTRL_ID_FILLED_BOX; - break; - case '?': - id = ED_CTRL_ID_PROPERTIES; - break; - case 'f': - id = ED_CTRL_ID_FLOOD_FILL; - break; - case 'b': - id = ED_CTRL_ID_GRAB_BRUSH; - break; - case ',': - id = ED_CTRL_ID_PICK_ELEMENT; - break; + case GADGET_ID_RANDOM_RESTRICTED: + *checkbutton_info[ED_CHECKBUTTON_ID_RANDOM_RESTRICTED].value ^= TRUE; + break; - case 'U': - id = ED_CTRL_ID_UNDO; - break; - case 'I': - id = ED_CTRL_ID_INFO; - break; - case 'S': - id = ED_CTRL_ID_SAVE; - break; - case 'C': - id = ED_CTRL_ID_CLEAR; - break; - case 'T': - id = ED_CTRL_ID_TEST; - break; - case 'E': - id = ED_CTRL_ID_EXIT; - break; + case GADGET_ID_DOUBLE_SPEED: + *checkbutton_info[ED_CHECKBUTTON_ID_DOUBLE_SPEED].value ^= TRUE; + break; - default: - id = ED_CTRL_ID_NONE; - break; - } + case GADGET_ID_STICK_ELEMENT: + *checkbutton_info[ED_CHECKBUTTON_ID_STICK_ELEMENT].value ^= TRUE; + break; - if (id != ED_CTRL_ID_NONE) - ClickOnGadget(level_editor_gadget[id]); - else + default: + if (id >= GADGET_ID_ELEMENTLIST_FIRST && + id <= GADGET_ID_ELEMENTLIST_LAST) { - switch (key) - { - case XK_Left: - id = ED_CTRL_ID_SCROLL_LEFT; - break; - case XK_Right: - id = ED_CTRL_ID_SCROLL_RIGHT; - break; - case XK_Up: - id = ED_CTRL_ID_SCROLL_UP; - break; - case XK_Down: - id = ED_CTRL_ID_SCROLL_DOWN; - break; + int element_position = id - GADGET_ID_ELEMENTLIST_FIRST; + int new_element = editor_element[element_position + element_shift]; - default: - id = ED_CTRL_ID_NONE; - break; + PickDrawingElement(button, new_element); + + if (!HAS_CONTENT(properties_element) || + !stick_element_properties_window) + { + properties_element = new_element; + if (edit_mode == ED_MODE_PROPERTIES) + DrawPropertiesWindow(); } - if (id != ED_CTRL_ID_NONE) - ClickOnGadget(level_editor_gadget[id]); + if (drawing_function == GADGET_ID_PICK_ELEMENT) + ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT); } - } +#ifdef DEBUG + else if (gi->event.type == GD_EVENT_PRESSED) + printf("default: HandleControlButtons: GD_EVENT_PRESSED(%d)\n", id); + else if (gi->event.type == GD_EVENT_RELEASED) + printf("default: HandleControlButtons: GD_EVENT_RELEASED(%d)\n", id); + else if (gi->event.type == GD_EVENT_MOVING) + printf("default: HandleControlButtons: GD_EVENT_MOVING(%d)\n", id); + else + printf("default: HandleControlButtons: ? (id == %d)\n", id); +#endif + break; } } -static void HandleTextInputGadgets(struct GadgetInfo *gi) +void HandleLevelEditorKeyInput(KeySym key) { - int id = gi->custom_id; + char letter = getCharFromKeySym(key); + int button = MB_LEFT; - switch (id) + if (drawing_function == GADGET_ID_TEXT && + DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE) { - case ED_CTRL_ID_LEVEL_NAME: - strcpy(level.name, gi->text.value); - break; + if (letter) + DrawLevelText(0, 0, letter, TEXT_WRITECHAR); + else if (key == XK_Delete || key == XK_BackSpace) + DrawLevelText(0, 0, 0, TEXT_BACKSPACE); + else if (key == XK_Return) + DrawLevelText(0, 0, 0, TEXT_NEWLINE); + } + else if (button_status == MB_RELEASED) + { + int i, id; - default: - break; + switch (key) + { + case XK_Left: + id = GADGET_ID_SCROLL_LEFT; + break; + case XK_Right: + id = GADGET_ID_SCROLL_RIGHT; + break; + case XK_Up: + id = GADGET_ID_SCROLL_UP; + break; + case XK_Down: + id = GADGET_ID_SCROLL_DOWN; + break; + case XK_Page_Up: + id = GADGET_ID_ELEMENTLIST_UP; + button = 3; + break; + case XK_Page_Down: + id = GADGET_ID_ELEMENTLIST_DOWN; + button = 3; + break; + + default: + id = GADGET_ID_NONE; + break; + } + + if (id != GADGET_ID_NONE) + ClickOnGadget(level_editor_gadget[id], button); + else if (letter == '.') + ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button); + else + for (i=0; idescription_text == NULL) + if (gi == NULL || gi->info_text == NULL) return; - strncpy(infotext, gi->description_text, MAX_INFOTEXT_LEN); + strncpy(infotext, gi->info_text, MAX_INFOTEXT_LEN); infotext[MAX_INFOTEXT_LEN] = '\0'; + if (gi->custom_id < ED_NUM_CTRL_BUTTONS) + { + int key = control_info[gi->custom_id].shortcut; + + if (key) + { + sprintf(shortcut, " ('%s%c')", + (key >= 'A' && key <= 'Z' ? "Shift-" : + gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""), + key); + + if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN) + strcat(infotext, shortcut); + } + } + DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FS_SMALL, FC_YELLOW); } @@ -3734,14 +3945,39 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) int sy = gi->event.y; int lx = sx + level_xpos; int ly = sy + level_ypos; + int min_sx = 0, min_sy = 0; + int max_sx = gi->drawing.area_xsize - 1; + int max_sy = gi->drawing.area_ysize - 1; ClearEditorGadgetInfoText(); - if (id == ED_CTRL_ID_DRAWING_LEVEL) + /* make sure to stay inside drawing area boundaries */ + sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx); + sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy); + + if (id == GADGET_ID_DRAWING_LEVEL) { - if (IN_LEV_FIELD(lx, ly)) + if (button_status) + { + int min_lx = 0, min_ly = 0; + int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1; + + /* get positions inside level field */ + lx = sx + level_xpos; + ly = sy + level_ypos; + + /* make sure to stay inside level field boundaries */ + lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx); + ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly); + + /* correct drawing area positions accordingly */ + sx = lx - level_xpos; + sy = ly - level_ypos; + } + + if (IN_ED_FIELD(sx,sy) && IN_LEV_FIELD(lx, ly)) { - if (gi->state == GD_BUTTON_PRESSED) + if (button_status) /* if (gi->state == GD_BUTTON_PRESSED) */ { if (gi->event.type == GD_EVENT_PRESSED) { @@ -3751,31 +3987,34 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) switch (drawing_function) { - case ED_CTRL_ID_SINGLE_ITEMS: + case GADGET_ID_SINGLE_ITEMS: infotext = "Drawing single items"; break; - case ED_CTRL_ID_CONNECTED_ITEMS: + case GADGET_ID_CONNECTED_ITEMS: infotext = "Drawing connected items"; break; - case ED_CTRL_ID_LINE: + case GADGET_ID_LINE: infotext = "Drawing line"; break; - case ED_CTRL_ID_TEXT: + case GADGET_ID_ARC: + infotext = "Drawing arc"; + break; + case GADGET_ID_TEXT: infotext = "Setting text cursor"; break; - case ED_CTRL_ID_RECTANGLE: + case GADGET_ID_RECTANGLE: infotext = "Drawing rectangle"; break; - case ED_CTRL_ID_FILLED_BOX: + case GADGET_ID_FILLED_BOX: infotext = "Drawing filled box"; break; - case ED_CTRL_ID_FLOOD_FILL: + case GADGET_ID_FLOOD_FILL: infotext = "Flood fill"; break; - case ED_CTRL_ID_GRAB_BRUSH: + case GADGET_ID_GRAB_BRUSH: infotext = "Grabbing brush"; break; - case ED_CTRL_ID_PICK_ELEMENT: + case GADGET_ID_PICK_ELEMENT: infotext = "Picking element"; break; @@ -3784,25 +4023,39 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) break; } - DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, - "%s: %d, %d", infotext, - ABS(lx - start_lx) + 1, - ABS(ly - start_ly) + 1); + if (drawing_function == GADGET_ID_PICK_ELEMENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, + "%s: %d, %d", infotext, lx, ly); + else + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, + "%s: %d, %d", infotext, + ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1); } + else if (drawing_function == GADGET_ID_PICK_ELEMENT) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, + "%s", element_info[Feld[lx][ly]]); else DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, "Level position: %d, %d", lx, ly); } /* misuse this function to draw brush cursor, if needed */ - if (edit_mode == ED_MODE_DRAWING && draw_with_brush) - CopyBrushToCursor(sx, sy); + if (edit_mode == ED_MODE_DRAWING && draw_with_brush && !button_status) + { + if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly)) + CopyBrushToCursor(sx, sy); + else + DeleteBrushFromCursor(); + } } - else if (id == ED_CTRL_ID_AMOEBA_CONTENT) + else if (id == GADGET_ID_AMOEBA_CONTENT) DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, "Amoeba content"); + else if (id == GADGET_ID_RANDOM_BACKGROUND) + DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, + "Random placement background"); else DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, - "Cruncher %d content: %d, %d", id - ED_CTRL_ID_ELEMCONT_0 + 1, - sx, sy); + "Content area %d position: %d, %d", + id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy); }