X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=91e10699148bb92ef47d048fe84fa2f129c7347a;hp=2812b01e9025311bb389fa9519b7c36a4fd68855;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=bdfe5693df0e5a9318bb7b0c8599426f2a47c127 diff --git a/src/editor.c b/src/editor.c index 2812b01e..91e10699 100644 --- a/src/editor.c +++ b/src/editor.c @@ -23,14 +23,12 @@ #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 6 +#define ED_WIN_MB_LEFT_YPOS 258 +#define ED_WIN_MB_MIDDLE_XPOS 42 +#define ED_WIN_MB_MIDDLE_YPOS ED_WIN_MB_LEFT_YPOS +#define ED_WIN_MB_RIGHT_XPOS 78 +#define ED_WIN_MB_RIGHT_YPOS ED_WIN_MB_LEFT_YPOS /* other constants for the editor */ #define ED_SCROLL_NO 0 @@ -47,18 +45,10 @@ /* how many steps can be cancelled */ #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 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 @@ -80,51 +70,46 @@ #define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) /* 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_XPOS 5 #define ED_ELEMENTLIST_YPOS 30 -#define ED_ELEMENTLIST_ALT_YPOS 190 -#define ED_ELEMENTLIST_XSIZE 22 -#define ED_ELEMENTLIST_YSIZE 22 +#define ED_ELEMENTLIST_XSIZE 20 +#define ED_ELEMENTLIST_YSIZE 20 #define ED_ELEMENTLIST_BUTTONS_HORIZ 4 -#define ED_ELEMENTLIST_BUTTONS_VERT 10 +#define ED_ELEMENTLIST_BUTTONS_VERT 11 #define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \ ED_ELEMENTLIST_BUTTONS_VERT) -/* values for element properties window */ -#define ED_PROPERTIES_XPOS (TILEX - MINI_TILEX/2) - -/* values for level information window */ -#define ED_LEVELINFO_XPOS (TILEX - MINI_TILEX/2) -#define ED_LEVELINFO_YPOS (TILEY - MINI_TILEY/2) +/* 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_ELEM_SCORE_XPOS ED_PROPERTIES_XPOS +#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_PROPERTIES_XPOS -#define ED_COUNT_ELEM_CONTENT_YPOS (17 * MINI_TILEY) -#define ED_COUNTER_YSTART (ED_LEVELINFO_YPOS + 3 * 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_ELEM_CONTENT_XPOS (TILEX) -#define ED_AREA_ELEM_CONTENT_YPOS (10 * TILEY) +#define ED_AREA_ELEM_CONTENT_XPOS ( 2 * MINI_TILEX) +#define ED_AREA_ELEM_CONTENT_YPOS (22 * MINI_TILEY) -/* values for scrolling gadgets */ +/* 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 */ #define ED_SCROLLBUTTON_XPOS 24 #define ED_SCROLLBUTTON_YPOS 0 #define ED_SCROLLBAR_XPOS 24 @@ -141,18 +126,80 @@ #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_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 +#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) -/* control button identifiers */ +/* values for scrolling gadgets for element list */ +#define ED_SCROLLBUTTON2_XPOS 50 +#define ED_SCROLLBUTTON2_YPOS 0 +#define ED_SCROLLBAR2_XPOS 50 +#define ED_SCROLLBAR2_YPOS 20 + +#define ED_SCROLLBUTTON2_XSIZE 10 +#define ED_SCROLLBUTTON2_YSIZE 10 + +#define ED_SCROLL2_UP_XPOS 85 +#define ED_SCROLL2_UP_YPOS 30 +#define ED_SCROLL2_DOWN_XPOS ED_SCROLL2_UP_XPOS +#define ED_SCROLL2_DOWN_YPOS (ED_SCROLL2_UP_YPOS + \ + ED_ELEMENTLIST_BUTTONS_VERT * \ + ED_ELEMENTLIST_YSIZE - \ + ED_SCROLLBUTTON2_YSIZE) +#define ED_SCROLL2_VERTICAL_XPOS ED_SCROLL2_UP_XPOS +#define ED_SCROLL2_VERTICAL_YPOS (ED_SCROLL2_UP_YPOS + \ + ED_SCROLLBUTTON2_YSIZE) +#define ED_SCROLL2_VERTICAL_XSIZE ED_SCROLLBUTTON2_XSIZE +#define ED_SCROLL2_VERTICAL_YSIZE (ED_ELEMENTLIST_BUTTONS_VERT * \ + ED_ELEMENTLIST_YSIZE - \ + 2 * ED_SCROLLBUTTON2_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_RADIOBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 44) +#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 66) + +/* some positions in the editor control window */ +#define ED_BUTTON_ELEM_XPOS 6 +#define ED_BUTTON_ELEM_YPOS 30 +#define ED_BUTTON_ELEM_XSIZE 22 +#define ED_BUTTON_ELEM_YSIZE 22 + +/* some values for text input and counter gadgets */ +#define ED_BUTTON_COUNT_YPOS 60 +#define ED_BUTTON_COUNT_XSIZE 20 +#define ED_BUTTON_COUNT_YSIZE 20 +#define ED_WIN_COUNT_XPOS (2 + ED_BUTTON_COUNT_XSIZE + 2) +#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS +#define ED_WIN_COUNT_XSIZE 52 +#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE +#define ED_WIN_COUNT2_XPOS 27 +#define ED_WIN_COUNT2_YPOS 3 +#define ED_WIN_COUNT2_XSIZE 46 +#define ED_WIN_COUNT2_YSIZE ED_BUTTON_COUNT_YSIZE + +#define ED_BUTTON_MINUS_XPOS 2 +#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS +#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE +#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE +#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2) +#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS +#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE +#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE + +/* editor gadget identifiers */ + +/* drawing toolbox buttons */ #define GADGET_ID_NONE -1 - #define GADGET_ID_SINGLE_ITEMS 0 #define GADGET_ID_CONNECTED_ITEMS 1 #define GADGET_ID_LINE 2 @@ -201,70 +248,139 @@ #define GADGET_ID_LEVEL_TIMESCORE_DOWN 43 #define GADGET_ID_LEVEL_TIMESCORE_TEXT 44 #define GADGET_ID_LEVEL_TIMESCORE_UP 45 +#define GADGET_ID_SELECT_LEVEL_DOWN 46 +#define GADGET_ID_SELECT_LEVEL_TEXT 47 +#define GADGET_ID_SELECT_LEVEL_UP 48 /* drawing area identifiers */ -#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 +#define GADGET_ID_DRAWING_LEVEL 49 +#define GADGET_ID_ELEM_CONTENT_0 50 +#define GADGET_ID_ELEM_CONTENT_1 51 +#define GADGET_ID_ELEM_CONTENT_2 52 +#define GADGET_ID_ELEM_CONTENT_3 53 +#define GADGET_ID_ELEM_CONTENT_4 54 +#define GADGET_ID_ELEM_CONTENT_5 55 +#define GADGET_ID_ELEM_CONTENT_6 56 +#define GADGET_ID_ELEM_CONTENT_7 57 +#define GADGET_ID_AMOEBA_CONTENT 58 /* text input identifiers */ -#define GADGET_ID_LEVEL_NAME 56 -#define GADGET_ID_LEVEL_AUTHOR 57 +#define GADGET_ID_LEVEL_NAME 59 +#define GADGET_ID_LEVEL_AUTHOR 60 /* gadgets for scrolling of drawing area */ -#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_VERTICAL 62 -#define GADGET_ID_SCROLL_HORIZONTAL 63 +#define GADGET_ID_SCROLL_UP 61 +#define GADGET_ID_SCROLL_DOWN 62 +#define GADGET_ID_SCROLL_LEFT 63 +#define GADGET_ID_SCROLL_RIGHT 64 +#define GADGET_ID_SCROLL_HORIZONTAL 65 +#define GADGET_ID_SCROLL_VERTICAL 66 /* gadgets for scrolling element list */ -#define GADGET_ID_ELEMENTLIST_UP 64 -#define GADGET_ID_ELEMENTLIST_DOWN 65 +#define GADGET_ID_SCROLL_LIST_UP 67 +#define GADGET_ID_SCROLL_LIST_DOWN 68 +#define GADGET_ID_SCROLL_LIST_VERTICAL 69 + +/* buttons for level settings */ +#define GADGET_ID_RANDOM_PERCENTAGE 70 +#define GADGET_ID_RANDOM_QUANTITY 71 +#define GADGET_ID_RANDOM_RESTRICTED 72 +#define GADGET_ID_DOUBLE_SPEED 73 +#define GADGET_ID_GRAVITY 74 +#define GADGET_ID_STICK_ELEMENT 75 + +/* another drawing area for random placement */ +#define GADGET_ID_RANDOM_BACKGROUND 76 /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST 66 -#define GADGET_ID_ELEMENTLIST_LAST 105 +#define GADGET_ID_ELEMENTLIST_FIRST 77 +#define GADGET_ID_ELEMENTLIST_LAST (77 + ED_NUM_ELEMENTLIST_BUTTONS - 1) -#define NUM_EDITOR_GADGETS 106 +#define NUM_EDITOR_GADGETS (GADGET_ID_ELEMENTLIST_LAST + 1) + +/* 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_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_RANDOM 4 -#define ED_COUNTER_ID_LEVEL_COLLECT 5 -#define ED_COUNTER_ID_LEVEL_TIMELIMIT 6 -#define ED_COUNTER_ID_LEVEL_TIMESCORE 7 +#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_COUNTER_ID_SELECT_LEVEL 8 + +#define ED_NUM_COUNTERBUTTONS 9 + +#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 + +#define ED_SCROLLBUTTON_ID_AREA_FIRST ED_SCROLLBUTTON_ID_AREA_UP +#define ED_SCROLLBUTTON_ID_AREA_LAST ED_SCROLLBUTTON_ID_AREA_RIGHT + +/* values for scrollbar gadgets */ +#define ED_SCROLLBAR_ID_AREA_HORIZONTAL 0 +#define ED_SCROLLBAR_ID_AREA_VERTICAL 1 +#define ED_SCROLLBAR_ID_LIST_VERTICAL 2 + +#define ED_NUM_SCROLLBARS 3 + +#define ED_SCROLLBAR_ID_AREA_FIRST ED_SCROLLBAR_ID_AREA_HORIZONTAL +#define ED_SCROLLBAR_ID_AREA_LAST ED_SCROLLBAR_ID_AREA_VERTICAL /* values for text input gadgets */ #define ED_TEXTINPUT_ID_LEVEL_NAME 0 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR 1 -#define ED_NUM_COUNTERBUTTONS 8 -#define ED_NUM_SCROLLBUTTONS 6 -#define ED_NUM_SCROLLBARS 2 #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_GRAVITY 1 +#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 2 +#define ED_CHECKBUTTON_ID_STICK_ELEMENT 3 + +#define ED_NUM_CHECKBUTTONS 4 + +#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 /* 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) +#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 { @@ -296,15 +412,15 @@ static struct { '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; +/* 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 { @@ -312,8 +428,8 @@ static struct int min_value, max_value; int gadget_id_down, gadget_id_up; int gadget_id_text; - int **counter_value; - char *infotext; + int *value; + char *infotext_above, *infotext_right; } counterbutton_info[ED_NUM_COUNTERBUTTONS] = { { @@ -321,86 +437,97 @@ static struct 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, /* will be set when used */ + "element score", NULL }, { ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS, - MIN_ELEM_CONTENT, MAX_ELEM_CONTENT, + MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS, GADGET_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP, GADGET_ID_ELEM_CONTENT_TEXT, - &gadget_elem_content_value, - "element content" + &level.num_yam_contents, + "element content", NULL }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(0), + 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 width" + &level.fieldx, + "playfield size", "width", }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(1), + 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, - "playfield height" + &level.fieldy, + NULL, "height", }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(2), - 0, 100, - GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP, - GADGET_ID_LEVEL_RANDOM_TEXT, - &gadget_level_random_value, - "number of random elements" - }, - { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(3), + 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" + &level.gems_needed, + "number of emeralds to collect", NULL }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(4), + 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" + &level.time, + "time available to solve level", "(0 => no time limit)" }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(5), + 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" + &level.score[SC_ZEITBONUS], + "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, + &random_placement_value, + "random element placement", "in" }, + { + DX + 5 - SX, DY + 3 - SY, + 1, 100, + GADGET_ID_SELECT_LEVEL_DOWN, GADGET_ID_SELECT_LEVEL_UP, + GADGET_ID_SELECT_LEVEL_TEXT, + &level_nr, + NULL, NULL + } }; static struct { int x, y; int gadget_id; + int size; char *value; char *infotext; } textinput_info[ED_NUM_TEXTINPUT] = { { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(6), + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(0), GADGET_ID_LEVEL_NAME, + MAX_LEVEL_NAME_LEN, level.name, - "Level Title" + "Title" }, { - ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(7), + ED_SETTINGS_XPOS, ED_COUNTER_YPOS(1), GADGET_ID_LEVEL_AUTHOR, + MAX_LEVEL_AUTHOR_LEN, level.author, - "Level Author" + "Author" } }; @@ -437,16 +564,16 @@ static struct "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" + ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 0 * ED_SCROLLBUTTON2_YSIZE, + ED_SCROLL2_UP_XPOS, ED_SCROLL2_UP_YPOS, + GADGET_ID_SCROLL_LIST_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" + ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 1 * ED_SCROLLBUTTON2_YSIZE, + ED_SCROLL2_DOWN_XPOS, ED_SCROLL2_DOWN_YPOS, + GADGET_ID_SCROLL_LIST_DOWN, + "scroll element list down ('Page Down')" } }; @@ -461,33 +588,127 @@ static struct } scrollbar_info[ED_NUM_SCROLLBARS] = { { - ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS, - ED_SCROLL_VERTICAL_XPOS, ED_SCROLL_VERTICAL_YPOS, - ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE, + ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS, + SX + ED_SCROLL_HORIZONTAL_XPOS, SY + 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, + SX + ED_SCROLL_VERTICAL_XPOS, SY + ED_SCROLL_VERTICAL_YPOS, + ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE, GD_TYPE_SCROLLBAR_VERTICAL, GADGET_ID_SCROLL_VERTICAL, "scroll level editing area vertically" }, { - 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_SCROLLBAR2_XPOS, ED_SCROLLBAR2_YPOS, + DX + ED_SCROLL2_VERTICAL_XPOS, DY + ED_SCROLL2_VERTICAL_YPOS, + ED_SCROLL2_VERTICAL_XSIZE, ED_SCROLL2_VERTICAL_YSIZE, + GD_TYPE_SCROLLBAR_VERTICAL, + GADGET_ID_SCROLL_LIST_VERTICAL, + "scroll element list vertically" + } +}; + +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_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 + 340, ED_COUNTER_YPOS(6) - MINI_TILEY, + GADGET_ID_GRAVITY, + &level.gravity, + "gravity", "set level gravity" + }, + { + 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('D'), + EL_CHAR('E'), + EL_CHAR('F'), + EL_CHAR('G'), + + 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); @@ -896,20 +1270,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; yfirst_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]); @@ -1418,15 +1972,43 @@ static void MapTextInputGadget(int id) MapGadget(level_editor_gadget[textinput_info[id].gadget_id]); } +static void MapRadiobuttonGadget(int id) +{ + MapGadget(level_editor_gadget[radiobutton_info[id].gadget_id]); +} + +static void MapCheckbuttonGadget(int id) +{ + MapGadget(level_editor_gadget[checkbutton_info[id].gadget_id]); +} + static void MapMainDrawingArea() { + boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx); + boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy); int i; - for (i=0; ix < DX) + if (level_editor_gadget[i]->x < SX + SXSIZE) UnmapGadget(level_editor_gadget[i]); } @@ -1453,19 +2035,60 @@ void UnmapLevelEditorGadgets() UnmapGadget(level_editor_gadget[i]); } -void DrawLevelEd() +static void ResetUndoBuffer() { - int i, x, y, graphic; + undo_buffer_position = -1; + undo_buffer_steps = -1; + CopyLevelToUndoBuffer(UNDO_IMMEDIATE); +} - edit_mode = ED_MODE_DRAWING; - name_typing = FALSE; +static void DrawEditModeWindow() +{ + if (edit_mode == ED_MODE_INFO) + DrawLevelInfoWindow(); + else if (edit_mode == ED_MODE_PROPERTIES) + DrawPropertiesWindow(); + else /* edit_mode == ED_MODE_DRAWING */ + DrawDrawingWindow(); +} - CloseDoor(DOOR_CLOSE_ALL); +static boolean LevelChanged() +{ + boolean level_changed = FALSE; + int x, y; + + for(y=0; ytext.value, level.name); + /* copy actual editor door content to door double buffer for OpenDoor() */ + XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc, + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); - MapControlButtons(); + DrawEditModeWindow(); /* - MapMainDrawingArea(); + FadeToFront(); */ - DrawDrawingWindow(); - FadeToFront(); + + OpenDoor(DOOR_OPEN_1); /* OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2); */ } -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_AREA_HORIZONTAL].width + xoffset; + height = scrollbar_info[ED_SCROLLBAR_ID_AREA_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]; int items_max, items_visible, item_position; if (id == GADGET_ID_SCROLL_HORIZONTAL) { - items_max = MAX(lev_fieldx + 2, ED_FIELDX); - items_visible = ED_FIELDX; + items_max = MAX(lev_fieldx + 2, ed_fieldx); + items_visible = ed_fieldx; item_position = level_xpos + 1; } else { - items_max = MAX(lev_fieldy + 2, ED_FIELDY); - 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); } -void ModifyEditorTextInput(int textinput_id, char *new_text) +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]; - ModifyTextInputTextValue(gi, new_text); + ModifyGadget(gi, GDI_TEXT_VALUE, new_text, GDI_END); } -void ModifyEditorCounter(int counter_id, int new_value) +static void ModifyEditorCounter(int counter_id, int new_value) { - int *counter_value = *counterbutton_info[counter_id].counter_value; + int *counter_value = counterbutton_info[counter_id].value; int gadget_id = counterbutton_info[counter_id].gadget_id_text; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; - ModifyTextInputNumberValue(gi, new_value); + ModifyGadget(gi, GDI_NUMBER_VALUE, new_value, GDI_END); if (counter_value != NULL) *counter_value = gi->text.number_value; } +static void ModifyEditorCounterLimits(int counter_id, int min, int max) +{ + int gadget_id = counterbutton_info[counter_id].gadget_id_text; + struct GadgetInfo *gi = level_editor_gadget[gadget_id]; + + ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END); +} + static void PickDrawingElement(int button, int element) { if (button < 1 || button > 3) @@ -1811,793 +2295,220 @@ static void PickDrawingElement(int button, int element) { new_element1 = element; DrawMiniGraphicExt(drawto, gc, - DX + ED_WIN_MB_LEFT_XPOS, - DY + ED_WIN_MB_LEFT_YPOS, + DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS, el2gfx(new_element1)); } else if (button == 2) { new_element2 = element; DrawMiniGraphicExt(drawto, gc, - DX + ED_WIN_MB_MIDDLE_XPOS, - DY + ED_WIN_MB_MIDDLE_YPOS, + DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS, el2gfx(new_element2)); } else { new_element3 = element; DrawMiniGraphicExt(drawto, gc, - DX + ED_WIN_MB_RIGHT_XPOS, - DY + ED_WIN_MB_RIGHT_YPOS, + DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS, el2gfx(new_element3)); } 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; - - - /* - int x = (mx-SX)/MINI_TILEX; - int y = (my-SY)/MINI_TILEY; - */ - - /* - HandlePressedControlButtons(); - HandleDrawingFunctions(mx, my, button); - */ - - if (use_floodfill) /********** FLOOD FILL **********/ - { - - -#if 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); - } - - use_floodfill = FALSE; - CloseDoor(DOOR_CLOSE_1); - OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); - } - return; - -#endif - - - - } - else /********** EDIT/CTRL-FENSTER **********/ - { - - -#if 0 - 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); - } - - 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; - - new_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); - - if (new_element != level.amoebe_inhalt) - { - level.amoebe_inhalt = new_element; - DrawMiniElement(29,26,new_element); - } - } - - 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; - - if (!button || !in_field_pressed || button<1 || button>3) - return; - - new_element = (button==1 ? new_element1 : - button==2 ? new_element2 : - button==3 ? new_element3 : 0); - - 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; - -#endif - - - - } - } - - last_button = button; - - BackToFront(); + ClearWindow(); + UnmapLevelEditorWindowGadgets(); + AdjustDrawingAreaGadgets(); + AdjustLevelScrollPosition(); + AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL); + AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL); + DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); + MapMainDrawingArea(); } -void LevelNameTyping(KeySym key) +static void DrawRandomPlacementBackgroundArea() { - unsigned char ascii = 0; - int len = strlen(level.name); - - if (!name_typing) - return; + 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; - 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 + ElementContent[0][0][0] = random_placement_background_element; - 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; - } -} + /* 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); -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; + XFillRectangle(display, drawto, gc, + area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1, + MINI_TILEX + 2, 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); + /* 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); - 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(GADGET_ID_SCROLL_HORIZONTAL); - AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL); - DrawMiniLevel(level_xpos, level_ypos); - MapMainDrawingArea(); + MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND); } static void DrawLevelInfoWindow() { char infotext[1024]; - int infotext_yoffset = MINI_TILEX + ED_GADGET_DISTANCE; + 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; ClearWindow(); UnmapLevelEditorWindowGadgets(); - DrawTextF(ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS, FC_YELLOW, - "Level Information"); + 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_num_objects; - gadget_level_collect_value = &level.edelsteine; - gadget_level_timelimit_value = &level.time; - gadget_level_timescore_value = &level.score[10]; - - /* draw counter gadgets for level info */ - for (i=ED_COUNTER_ID_LEVEL_XSIZE; i<=ED_COUNTER_ID_LEVEL_TIMESCORE; i++) + /* draw counter gadgets */ + for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++) { - x = counterbutton_info[i].x; - y = counterbutton_info[i].y - infotext_yoffset; + 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); - infotext[MAX_INFOTEXT_LEN] = '\0'; + sprintf(infotext, "%s:", counterbutton_info[i].infotext_above); + infotext[MAX_INFOTEXT_LEN] = '\0'; + DrawTextF(x, y, font_color, 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_color, infotext); + } - DrawTextF(x, y, FC_YELLOW, infotext); - ModifyEditorCounter(i, **counterbutton_info[i].counter_value); + ModifyEditorCounter(i, *counterbutton_info[i].value); MapCounterButtons(i); } - /* draw text input gadgets for level info */ - for (i=ED_TEXTINPUT_ID_LEVEL_NAME; i<=ED_TEXTINPUT_ID_LEVEL_AUTHOR; i++) + /* draw text input gadgets */ + for (i=ED_TEXTINPUT_ID_LEVEL_FIRST; i<=ED_TEXTINPUT_ID_LEVEL_LAST; i++) { - x = textinput_info[i].x; - y = textinput_info[i].y - infotext_yoffset; + 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, FC_YELLOW, infotext); + DrawTextF(x, y, font_color, infotext); ModifyEditorTextInput(i, textinput_info[i].value); MapTextInputGadget(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_color, 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_color, checkbutton_info[i].text); + ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id], + GDI_CHECKED, *checkbutton_info[i].value, GDI_END); + MapCheckbuttonGadget(i); + } + + /* draw drawing area */ + DrawRandomPlacementBackgroundArea(); +} + +static void DrawAmoebaContentArea() +{ + 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; + + ElementContent[0][0][0] = level.amoeba_content; + + /* 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); + + 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); + + DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", + FS_SMALL, font_color); + + DrawMiniElement(area_x, area_y, ElementContent[0][0][0]); + + MapDrawingArea(GADGET_ID_AMOEBA_CONTENT); } static void DrawElementContentAreas() { - int *num_areas = &MampferMax; + int counter_id = ED_COUNTER_ID_ELEM_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 = counter_xsize; + int yoffset_right = ED_BORDER_SIZE; + int font_color = FC_GREEN; int i, x, y; - for (i=0; i= 'a' && letter <= 'z') @@ -3233,7 +3134,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) { @@ -3270,9 +3171,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); @@ -3283,13 +3184,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); @@ -3301,9 +3202,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, @@ -3322,6 +3228,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) @@ -3352,6 +3259,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); } @@ -3411,7 +3343,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); } @@ -3419,16 +3351,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 inside_drawing_area = !gi->event.off_borders; boolean draw_level = (id == GADGET_ID_DRAWING_LEVEL); - int new_element; + 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; @@ -3436,11 +3369,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) /* handle info callback for each invocation of action callback */ gi->callback_info(gi); - /* - if (edit_mode != ED_MODE_DRAWING) - return; - */ - button_press_event = (gi->event.type == GD_EVENT_PRESSED); button_release_event = (gi->event.type == GD_EVENT_RELEASED); @@ -3454,6 +3382,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); @@ -3472,21 +3403,11 @@ 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 0 - if (button_release_event) - button = 0; -#endif - - - if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS) - return; + /* 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 GADGET_ID_SINGLE_ITEMS: if (draw_level) @@ -3520,8 +3441,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); } @@ -3545,10 +3466,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) el2gfx(new_element)); if (id == GADGET_ID_AMOEBA_CONTENT) - level.amoebe_inhalt = new_element; + level.amoeba_content = new_element; + 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] = + level.yam_content[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] = new_element; } break; @@ -3614,7 +3537,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) { CopyAreaToBrush(start_sx, start_sy, sx, sy, button); CopyBrushToCursor(sx, sy); - ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]); + ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],MB_LEFT); draw_with_brush = TRUE; } else if (drawing_function == GADGET_ID_TEXT) @@ -3632,38 +3555,21 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } break; - - -#if 0 - case GADGET_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 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 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: @@ -3673,96 +3579,52 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) static void HandleCounterButtons(struct GadgetInfo *gi) { - int id = gi->custom_id; + int gadget_id = gi->custom_id; + int counter_id = gi->custom_type_id; int button = gi->event.button; - int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + int *counter_value = counterbutton_info[counter_id].value; + int step = BUTTON_STEPSIZE(button) * + (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1); - switch (id) + if (counter_id == ED_COUNTER_ID_SELECT_LEVEL) { - 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; + boolean pressed = (gi->event.type == GD_EVENT_PRESSED); + boolean released = (gi->event.type == GD_EVENT_RELEASED); + boolean level_changed = LevelChanged(); - 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; + if ((level_changed && pressed) || (!level_changed && released)) + return; - 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; + if (level_changed && !Request("Level has changed! Discard changes ?", + REQ_ASK)) + { + if (gadget_id == counterbutton_info[counter_id].gadget_id_text) + ModifyEditorCounter(counter_id, *counter_value); + return; + } + } - 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; + if (gadget_id == counterbutton_info[counter_id].gadget_id_text) + *counter_value = gi->text.number_value; + else + ModifyEditorCounter(counter_id, *counter_value + step); - 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; + switch (counter_id) + { + case ED_COUNTER_ID_ELEM_CONTENT: + DrawElementContentAreas(); 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; + case ED_COUNTER_ID_LEVEL_XSIZE: + case ED_COUNTER_ID_LEVEL_YSIZE: + lev_fieldx = level.fieldx; + lev_fieldy = level.fieldy; 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; + case ED_COUNTER_ID_SELECT_LEVEL: + LoadLevel(level_nr); + ResetUndoBuffer(); + DrawEditModeWindow(); break; default: @@ -3772,37 +3634,28 @@ static void HandleCounterButtons(struct GadgetInfo *gi) 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; + strcpy(textinput_info[gi->custom_type_id].value, gi->text.value); +} - case GADGET_ID_LEVEL_AUTHOR: - strcpy(level.author, gi->text.value); - break; +static void HandleRadiobuttons(struct GadgetInfo *gi) +{ + *radiobutton_info[gi->custom_type_id].value = + radiobutton_info[gi->custom_type_id].checked_value; +} - default: - break; - } +static void HandleCheckbuttons(struct GadgetInfo *gi) +{ + *checkbutton_info[gi->custom_type_id].value ^= TRUE; } 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 player_present = FALSE; - int level_changed = FALSE; + int step = BUTTON_STEPSIZE(button); + int new_element = BUTTON_ELEMENT(button); int i, x, y; - new_element = (button == 1 ? new_element1 : - button == 2 ? new_element2 : - button == 3 ? new_element3 : 0); - if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT) DrawLevelText(0, 0, 0, TEXT_END); @@ -3818,11 +3671,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) case GADGET_ID_SCROLL_LEFT: if (level_xpos >= 0) { - 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; @@ -3831,42 +3680,36 @@ 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(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL], + GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END); } break; case GADGET_ID_SCROLL_RIGHT: - if (level_xpos <= lev_fieldx - ED_FIELDX) + if (level_xpos <= lev_fieldx - ed_fieldx) { - 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(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL], + GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END); } break; case GADGET_ID_SCROLL_UP: if (level_ypos >= 0) { - 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; @@ -3875,63 +3718,72 @@ 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(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END); } break; case GADGET_ID_SCROLL_DOWN: - if (level_ypos <= lev_fieldy - ED_FIELDY) + if (level_ypos <= lev_fieldy - ed_fieldy) { - 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(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END); } break; 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 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; + case GADGET_ID_SCROLL_LIST_UP: + case GADGET_ID_SCROLL_LIST_DOWN: + case GADGET_ID_SCROLL_LIST_VERTICAL: + if (id == GADGET_ID_SCROLL_LIST_VERTICAL) + element_shift = gi->event.item_position * ED_ELEMENTLIST_BUTTONS_HORIZ; + else + { + step *= (id == GADGET_ID_SCROLL_LIST_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; - 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; + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, + element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END); + } for (i=0; ideco.design; + struct GadgetDesign *gd = &gi->deco.design; + int element = editor_element[element_shift + i]; UnmapGadget(gi); - getMiniGraphicSource(el2gfx(editor_element[element_shift + i]), - &design->pixmap, &design->x, &design->y); + getMiniGraphicSource(el2gfx(element), &gd->pixmap, &gd->x, &gd->y); + ModifyGadget(gi, GDI_INFO_TEXT, element_info[element], GDI_END); MapGadget(gi); } break; @@ -3968,7 +3820,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; case GADGET_ID_RANDOM_PLACEMENT: - RandomPlacement(button); + RandomPlacement(new_element); break; case GADGET_ID_PROPERTIES: @@ -3999,7 +3851,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) for(x=0; xreadonly) { Request("This level is read only !", REQ_CONFIRM); break; } - for(y=0; yevent.type == GD_EVENT_PRESSED) - printf("default: HandleControlButtons: GD_EVENT_PRESSED\n"); + printf("default: HandleControlButtons: GD_EVENT_PRESSED(%d)\n", id); else if (gi->event.type == GD_EVENT_RELEASED) - printf("default: HandleControlButtons: GD_EVENT_RELEASED\n"); + printf("default: HandleControlButtons: GD_EVENT_RELEASED(%d)\n", id); else if (gi->event.type == GD_EVENT_MOVING) - printf("default: HandleControlButtons: GD_EVENT_MOVING\n"); + printf("default: HandleControlButtons: GD_EVENT_MOVING(%d)\n", id); else - printf("default: HandleControlButtons: ?\n"); + printf("default: HandleControlButtons: ? (id == %d)\n", id); #endif break; } @@ -4174,52 +3987,62 @@ static void HandleControlButtons(struct GadgetInfo *gi) void HandleLevelEditorKeyInput(KeySym key) { - if (edit_mode == ED_MODE_DRAWING) + char letter = getCharFromKeySym(key); + int button = MB_LEFT; + + if (drawing_function == GADGET_ID_TEXT && + DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE) + { + 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) { - char letter = getCharFromKeySym(key); + int i, id; - if (drawing_function == GADGET_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) + switch (key) { - int i, id; - - 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; - - default: - id = GADGET_ID_NONE; - break; - } + 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_SCROLL_LIST_UP; + button = 3; + break; + case XK_Page_Down: + id = GADGET_ID_SCROLL_LIST_DOWN; + button = 3; + break; - if (id != GADGET_ID_NONE) - ClickOnGadget(level_editor_gadget[id]); - else if (letter == '.') - ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]); - else - for (i=0; i= 'A' && key <= 'Z' ? "Shift-" : - gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""), - key); + if (gi->custom_id == GADGET_ID_SINGLE_ITEMS) /* special case 1 */ + sprintf(shortcut, " ('.' or '%c')", key); + else if (gi->custom_id == GADGET_ID_TEST) /* special case 2 */ + sprintf(shortcut, " ('Enter' or 'Shift-%c')", key); + else /* normal case */ + sprintf(shortcut, " ('%s%c')", + (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key); if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN) strcat(infotext, shortcut); @@ -4276,23 +4102,23 @@ 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(); + /* 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 (button_status) { - int min_sx = 0, min_sy = 0; - int max_sx = gi->drawing.area_xsize - 1; - int max_sy = gi->drawing.area_ysize - 1; int min_lx = 0, min_ly = 0; int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1; - /* 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); - /* get positions inside level field */ lx = sx + level_xpos; ly = sy + level_ypos; @@ -4354,11 +4180,17 @@ 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); @@ -4376,8 +4208,11 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) 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", + "Content area %d position: %d, %d", id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy); }