X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=64e96e24164b6515b4c6ae7bcd3a52ead062fe1b;hb=f941ccddee3065d7531298e37ad4dcfcd892c1f8;hp=cb50572ecf4d45a8d1cd285caf254a16b55b16ac;hpb=2eb48ed1142be3334211d4e7740d64bd7cdbf55c;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index cb50572e..64e96e24 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,106 +23,132 @@ #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 +#define RANDOM_USE_PERCENTAGE 0 +#define RANDOM_USE_NUM_OBJECTS 1 /* values for elements with score */ -#define MIN_SCORE 0 -#define MAX_SCORE 255 +#define MIN_SCORE 0 +#define MAX_SCORE 255 /* values for elements with content */ -#define MIN_ELEMCONT 1 -#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 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 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_VALUE_XOFFSET 5 +#define ED_COUNT_VALUE_YOFFSET 3 +#define ED_COUNT_ELEM_SCORE_XPOS ED_PROPERTIES_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_COUNTER_YDISTANCE (3 * MINI_TILEY) +#define ED_COUNTER_YPOS(n) (ED_COUNTER_YSTART + \ + n * ED_COUNTER_YDISTANCE) /* standard distances */ -#define ED_BORDER_SIZE 3 -#define ED_GADGET_DISTANCE 2 +#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 (TILEX) +#define ED_AREA_ELEM_CONTENT_YPOS (10 * 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_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_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 @@ -128,14 +156,14 @@ #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_ARC 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_TEXT 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_PROPERTIES 10 #define ED_CTRL_ID_WRAP_RIGHT 11 #define ED_CTRL_ID_RANDOM_PLACEMENT 12 #define ED_CTRL_ID_GRAB_BRUSH 13 @@ -149,50 +177,95 @@ #define ED_CTRL_ID_EXIT 21 /* counter button identifiers */ -#define ED_CTRL_ID_SCORE_DOWN 22 -#define ED_CTRL_ID_SCORE_TEXT 23 -#define ED_CTRL_ID_SCORE_UP 24 -#define ED_CTRL_ID_ELEMCONT_DOWN 25 -#define ED_CTRL_ID_ELEMCONT_TEXT 26 -#define ED_CTRL_ID_ELEMCONT_UP 27 +#define ED_CTRL_ID_ELEM_SCORE_DOWN 22 +#define ED_CTRL_ID_ELEM_SCORE_TEXT 23 +#define ED_CTRL_ID_ELEM_SCORE_UP 24 +#define ED_CTRL_ID_ELEM_CONTENT_DOWN 25 +#define ED_CTRL_ID_ELEM_CONTENT_TEXT 26 +#define ED_CTRL_ID_ELEM_CONTENT_UP 27 +#define ED_CTRL_ID_LEVEL_XSIZE_DOWN 28 +#define ED_CTRL_ID_LEVEL_XSIZE_TEXT 29 +#define ED_CTRL_ID_LEVEL_XSIZE_UP 30 +#define ED_CTRL_ID_LEVEL_YSIZE_DOWN 31 +#define ED_CTRL_ID_LEVEL_YSIZE_TEXT 32 +#define ED_CTRL_ID_LEVEL_YSIZE_UP 33 +#define ED_CTRL_ID_LEVEL_RANDOM_DOWN 34 +#define ED_CTRL_ID_LEVEL_RANDOM_TEXT 35 +#define ED_CTRL_ID_LEVEL_RANDOM_UP 36 +#define ED_CTRL_ID_LEVEL_COLLECT_DOWN 37 +#define ED_CTRL_ID_LEVEL_COLLECT_TEXT 38 +#define ED_CTRL_ID_LEVEL_COLLECT_UP 39 +#define ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN 40 +#define ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT 41 +#define ED_CTRL_ID_LEVEL_TIMELIMIT_UP 42 +#define ED_CTRL_ID_LEVEL_TIMESCORE_DOWN 43 +#define ED_CTRL_ID_LEVEL_TIMESCORE_TEXT 44 +#define ED_CTRL_ID_LEVEL_TIMESCORE_UP 45 /* drawing area identifiers */ -#define ED_CTRL_ID_DRAWING_LEVEL 28 -#define ED_CTRL_ID_ELEMCONT_0 29 -#define ED_CTRL_ID_ELEMCONT_1 30 -#define ED_CTRL_ID_ELEMCONT_2 31 -#define ED_CTRL_ID_ELEMCONT_3 32 -#define ED_CTRL_ID_ELEMCONT_4 33 -#define ED_CTRL_ID_ELEMCONT_5 34 -#define ED_CTRL_ID_ELEMCONT_6 35 -#define ED_CTRL_ID_ELEMCONT_7 36 -#define ED_CTRL_ID_AMOEBA_CONTENT 37 +#define ED_CTRL_ID_DRAWING_LEVEL 46 +#define ED_CTRL_ID_ELEM_CONTENT_0 47 +#define ED_CTRL_ID_ELEM_CONTENT_1 48 +#define ED_CTRL_ID_ELEM_CONTENT_2 49 +#define ED_CTRL_ID_ELEM_CONTENT_3 50 +#define ED_CTRL_ID_ELEM_CONTENT_4 51 +#define ED_CTRL_ID_ELEM_CONTENT_5 52 +#define ED_CTRL_ID_ELEM_CONTENT_6 53 +#define ED_CTRL_ID_ELEM_CONTENT_7 54 +#define ED_CTRL_ID_AMOEBA_CONTENT 55 /* text input identifiers */ -#define ED_CTRL_ID_LEVEL_NAME 38 +#define ED_CTRL_ID_LEVEL_NAME 56 +#define ED_CTRL_ID_LEVEL_AUTHOR 57 /* gadgets for scrolling of drawing area */ -#define ED_CTRL_ID_SCROLL_UP 39 -#define ED_CTRL_ID_SCROLL_DOWN 40 -#define ED_CTRL_ID_SCROLL_LEFT 41 -#define ED_CTRL_ID_SCROLL_RIGHT 42 -#define ED_CTRL_ID_SCROLL_VERTICAL 43 -#define ED_CTRL_ID_SCROLL_HORIZONTAL 44 +#define ED_CTRL_ID_SCROLL_UP 58 +#define ED_CTRL_ID_SCROLL_DOWN 59 +#define ED_CTRL_ID_SCROLL_LEFT 60 +#define ED_CTRL_ID_SCROLL_RIGHT 61 +#define ED_CTRL_ID_SCROLL_VERTICAL 62 +#define ED_CTRL_ID_SCROLL_HORIZONTAL 63 -#define ED_NUM_GADGETS 45 +/* gadgets for scrolling element list */ +#define ED_CTRL_ID_ELEMENTLIST_UP 64 +#define ED_CTRL_ID_ELEMENTLIST_DOWN 65 -/* values for counter gadgets */ -#define ED_COUNTER_ID_SCORE 0 -#define ED_COUNTER_ID_ELEMCONT 1 +/* gadgets for buttons in element list */ +#define ED_CTRL_ID_ELEMENTLIST_FIRST 66 +#define ED_CTRL_ID_ELEMENTLIST_LAST 105 + +#define ED_NUM_GADGETS 106 -#define ED_NUM_COUNTERBUTTONS 2 -#define ED_NUM_SCROLLBUTTONS 4 +/* 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 + +/* 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 /* 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) + static struct { char shortcut; @@ -202,14 +275,14 @@ static struct { 's', "draw single items" }, { 'd', "draw connected items" }, { 'l', "draw lines" }, - { 't', "enter text elements" }, + { 'a', "draw arcs" }, { 'r', "draw outline rectangles" }, { 'R', "draw filled rectangles" }, { '\0', "wrap (rotate) level up" }, - { '?', "properties of drawing element" }, + { 't', "enter text elements" }, { 'f', "flood fill" }, { '\0', "wrap (rotate) level left" }, - { '\0', "" }, + { '?', "properties of drawing element" }, { '\0', "wrap (rotate) level right" }, { '\0', "random element placement" }, { 'b', "grab brush" }, @@ -224,28 +297,111 @@ static struct }; /* pointers to counter values */ -static int *gadget_score_value = NULL; -static int *gadget_areas_value = NULL; +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 **counter_value; int min_value, max_value; int gadget_id_down, gadget_id_up; int gadget_id_text; + int **counter_value; + char *infotext; } counterbutton_info[ED_NUM_COUNTERBUTTONS] = { - { ED_COUNT_SCORE_XPOS, ED_COUNT_SCORE_YPOS, - &gadget_score_value, - MIN_SCORE, MAX_SCORE, - ED_CTRL_ID_SCORE_DOWN, ED_CTRL_ID_SCORE_UP, - ED_CTRL_ID_SCORE_TEXT }, - { ED_COUNT_ELEMCONT_XPOS, ED_COUNT_ELEMCONT_YPOS, - &gadget_areas_value, - MIN_ELEMCONT, MAX_ELEMCONT, - ED_CTRL_ID_ELEMCONT_DOWN, ED_CTRL_ID_ELEMCONT_UP, - ED_CTRL_ID_ELEMCONT_TEXT } + { + ED_COUNT_ELEM_SCORE_XPOS, ED_COUNT_ELEM_SCORE_YPOS, + MIN_SCORE, MAX_SCORE, + ED_CTRL_ID_ELEM_SCORE_DOWN, ED_CTRL_ID_ELEM_SCORE_UP, + ED_CTRL_ID_ELEM_SCORE_TEXT, + &gadget_elem_score_value, + "element score" + }, + { + ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS, + MIN_ELEM_CONTENT, MAX_ELEM_CONTENT, + ED_CTRL_ID_ELEM_CONTENT_DOWN, ED_CTRL_ID_ELEM_CONTENT_UP, + ED_CTRL_ID_ELEM_CONTENT_TEXT, + &gadget_elem_content_value, + "element content" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(0), + MIN_LEV_FIELDX, MAX_LEV_FIELDX, + ED_CTRL_ID_LEVEL_XSIZE_DOWN, ED_CTRL_ID_LEVEL_XSIZE_UP, + ED_CTRL_ID_LEVEL_XSIZE_TEXT, + &gadget_level_xsize_value, + "playfield width" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(1), + MIN_LEV_FIELDY, MAX_LEV_FIELDY, + ED_CTRL_ID_LEVEL_YSIZE_DOWN, ED_CTRL_ID_LEVEL_YSIZE_UP, + ED_CTRL_ID_LEVEL_YSIZE_TEXT, + &gadget_level_ysize_value, + "playfield height" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(2), + 0, 100, + ED_CTRL_ID_LEVEL_RANDOM_DOWN, ED_CTRL_ID_LEVEL_RANDOM_UP, + ED_CTRL_ID_LEVEL_RANDOM_TEXT, + &gadget_level_random_value, + "number of random elements" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(3), + 0, 999, + ED_CTRL_ID_LEVEL_COLLECT_DOWN, ED_CTRL_ID_LEVEL_COLLECT_UP, + ED_CTRL_ID_LEVEL_COLLECT_TEXT, + &gadget_level_collect_value, + "number of emeralds to collect" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(4), + 0, 999, + ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN, ED_CTRL_ID_LEVEL_TIMELIMIT_UP, + ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT, + &gadget_level_timelimit_value, + "time available to solve level" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(5), + 0, 255, + ED_CTRL_ID_LEVEL_TIMESCORE_DOWN, ED_CTRL_ID_LEVEL_TIMESCORE_UP, + ED_CTRL_ID_LEVEL_TIMESCORE_TEXT, + &gadget_level_timescore_value, + "score for each 10 seconds left" + }, +}; + +static struct +{ + int x, y; + int gadget_id; + char *value; + char *infotext; +} textinput_info[ED_NUM_TEXTINPUT] = +{ + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(6), + ED_CTRL_ID_LEVEL_NAME, + level.name, + "Level Title" + }, + { + ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(7), + ED_CTRL_ID_LEVEL_AUTHOR, + level.author, + "Level Author" + } }; static struct @@ -253,28 +409,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, + ED_CTRL_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, + ED_CTRL_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, + ED_CTRL_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, + ED_CTRL_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, + ED_CTRL_ID_ELEMENTLIST_UP, + "scroll element list up" + }, + { + ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS, + ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS, + ED_CTRL_ID_ELEMENTLIST_DOWN, + "scroll element list down" } }; @@ -285,7 +457,7 @@ static struct int width, height; int type; int gadget_id; - char *text; + char *infotext; } scrollbar_info[ED_NUM_SCROLLBARS] = { { @@ -308,6 +480,7 @@ static struct /* forward declaration for internal use */ static void DrawDrawingWindow(); +static void DrawLevelInfoWindow(); static void DrawPropertiesWindow(); static void CopyLevelToUndoBuffer(int); static void HandleControlButtons(struct GadgetInfo *); @@ -317,14 +490,13 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *); static void HandleTextInputGadgets(struct GadgetInfo *); static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS]; -static boolean level_editor_gadgets_created = FALSE; static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS; static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS; static boolean draw_with_brush = FALSE; static int properties_element = 0; -static short ElementContent[MAX_ELEMCONT][3][3]; +static short ElementContent[MAX_ELEM_CONTENT][3][3]; static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY]; static int undo_buffer_position = 0; @@ -338,13 +510,15 @@ static int random_placement_method = RANDOM_USE_PERCENTAGE; static int random_placement_method = RANDOM_USE_NUM_OBJECTS; #endif -static int level_xpos,level_ypos; +static int level_xpos, level_ypos; static int edit_mode; static boolean name_typing; static int new_element1 = EL_MAUERWERK; static int new_element2 = EL_LEERRAUM; static int new_element3 = EL_ERDREICH; +static int counter_xsize = DXSIZE + 20; + int element_shift = 0; int editor_element[] = @@ -529,10 +703,10 @@ int editor_element[] = EL_MAUER_Y, EL_MAUER_XY, + EL_INVISIBLE_STEEL, + EL_UNSICHTBAR, EL_SPEED_PILL, EL_LEERRAUM, - EL_LEERRAUM, - EL_LEERRAUM, EL_CHAR_A + ('S' - 'A'), EL_CHAR_A + ('O' - 'A'), @@ -743,14 +917,6 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll) BackToFront(); } -void InitLevelEditorGadgets() -{ - int i; - - for (i=0; ix < DX) + UnmapGadget(level_editor_gadget[i]); } void UnmapLevelEditorGadgets() @@ -1314,10 +1566,7 @@ void DrawLevelEd() OpenDoor(DOOR_OPEN_1); - if (!level_editor_gadgets_created) - CreateLevelEditorGadgets(); - else - strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name); + strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name); MapControlButtons(); @@ -1533,8 +1782,9 @@ void AdjustEditorScrollbar(int id) AdjustScrollbar(gi, items_max, item_position); } -void ModifyEditorTextInput(int gadget_id, char *new_text) +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); @@ -1588,7 +1838,11 @@ static void PickDrawingElement(int button, int element) void LevelEd(int mx, int my, int button) { static int last_button = 0; + + /* static int in_field_pressed = FALSE; + */ + static boolean use_floodfill = FALSE; @@ -1645,6 +1899,9 @@ void LevelEd(int mx, int my, int button) } 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; @@ -1657,14 +1914,8 @@ void LevelEd(int mx, int my, int button) int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int i; -#if 0 - step = (button==1 ? MAX_ELEM_X : button==2 ? 5*MAX_ELEM_X : - elements_in_list); - element_shift += (choice==ED_BUTTON_EUP ? -step : step); -#else step = step * MAX_ELEM_X * (choice == ED_BUTTON_EUP ? -1 : +1); element_shift += step; -#endif if (element_shift<0) element_shift = 0; @@ -1694,6 +1945,9 @@ void LevelEd(int mx, int my, int button) DrawPropertiesWindow(); } } +#endif + + if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/ { @@ -1848,6 +2102,10 @@ void LevelEd(int mx, int my, int button) } else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/ { + + +#if 0 + int choice = CheckCountButtons(mx,my,button); int step = (button==1 ? 1 : button==2 ? 5 : button==3 ? 10 : 0); @@ -1977,10 +2235,6 @@ void LevelEd(int mx, int my, int button) XFlush(display); } - - -#if 0 - switch(CheckCtrlButtons(mx,my,button)) { case ED_BUTTON_EDIT: @@ -2057,10 +2311,6 @@ void LevelEd(int mx, int my, int button) break; } -#endif - - - if (mx>=ED_COUNT_GADGET_XPOS && mx=ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE && @@ -2142,6 +2392,11 @@ void LevelEd(int mx, int my, int button) } else if (!motion_status) /* Mauszeiger nicht im Cruncher-Feld */ in_field_pressed = FALSE; + +#endif + + + } } @@ -2183,7 +2438,7 @@ void LevelNameTyping(KeySym key) ascii = '_'; #endif - if (ascii && len 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); +} + +#if 0 +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; @@ -3178,8 +3546,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) if (id == ED_CTRL_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 >= ED_CTRL_ID_ELEM_CONTENT_0 && + id <= ED_CTRL_ID_ELEM_CONTENT_7) + level.mampfer_inhalt[id - ED_CTRL_ID_ELEM_CONTENT_0][sx][sy] = new_element; } break; @@ -3204,6 +3573,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) break; case ED_CTRL_ID_LINE: + case ED_CTRL_ID_ARC: case ED_CTRL_ID_RECTANGLE: case ED_CTRL_ID_FILLED_BOX: case ED_CTRL_ID_GRAB_BRUSH: @@ -3217,6 +3587,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) if (drawing_function == ED_CTRL_ID_LINE) draw_func = DrawLine; + else if (drawing_function == ED_CTRL_ID_ARC) + draw_func = DrawArc; else if (drawing_function == ED_CTRL_ID_RECTANGLE) draw_func = DrawRectangle; else if (drawing_function == ED_CTRL_ID_FILLED_BOX) @@ -3307,26 +3679,92 @@ static void HandleCounterButtons(struct GadgetInfo *gi) switch (id) { - case ED_CTRL_ID_SCORE_DOWN: - case ED_CTRL_ID_SCORE_UP: - step *= (id == ED_CTRL_ID_SCORE_DOWN ? -1 : 1); - ModifyEditorCounter(ED_COUNTER_ID_SCORE, *gadget_score_value + step); + case ED_CTRL_ID_ELEM_SCORE_DOWN: + case ED_CTRL_ID_ELEM_SCORE_UP: + step *= (id == ED_CTRL_ID_ELEM_SCORE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, + *gadget_elem_score_value + step); break; - case ED_CTRL_ID_SCORE_TEXT: - *gadget_score_value = gi->text.number_value; + case ED_CTRL_ID_ELEM_SCORE_TEXT: + *gadget_elem_score_value = gi->text.number_value; break; - case ED_CTRL_ID_ELEMCONT_DOWN: - case ED_CTRL_ID_ELEMCONT_UP: - step *= (id == ED_CTRL_ID_ELEMCONT_DOWN ? -1 : 1); - ModifyEditorCounter(ED_COUNTER_ID_ELEMCONT, *gadget_areas_value + step); + case ED_CTRL_ID_ELEM_CONTENT_DOWN: + case ED_CTRL_ID_ELEM_CONTENT_UP: + step *= (id == ED_CTRL_ID_ELEM_CONTENT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, + *gadget_elem_content_value + step); DrawElementContentAreas(); break; - case ED_CTRL_ID_ELEMCONT_TEXT: - *gadget_areas_value = gi->text.number_value; + case ED_CTRL_ID_ELEM_CONTENT_TEXT: + *gadget_elem_content_value = gi->text.number_value; DrawElementContentAreas(); break; + case ED_CTRL_ID_LEVEL_XSIZE_DOWN: + case ED_CTRL_ID_LEVEL_XSIZE_UP: + step *= (id == ED_CTRL_ID_LEVEL_XSIZE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE, + *gadget_level_xsize_value + step); + level.fieldx = lev_fieldx; + break; + case ED_CTRL_ID_LEVEL_XSIZE_TEXT: + *gadget_level_xsize_value = gi->text.number_value; + level.fieldx = lev_fieldx; + break; + + case ED_CTRL_ID_LEVEL_YSIZE_DOWN: + case ED_CTRL_ID_LEVEL_YSIZE_UP: + step *= (id == ED_CTRL_ID_LEVEL_YSIZE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE, + *gadget_level_ysize_value + step); + level.fieldy = lev_fieldy; + break; + case ED_CTRL_ID_LEVEL_YSIZE_TEXT: + *gadget_level_ysize_value = gi->text.number_value; + level.fieldy = lev_fieldy; + break; + + case ED_CTRL_ID_LEVEL_RANDOM_DOWN: + case ED_CTRL_ID_LEVEL_RANDOM_UP: + step *= (id == ED_CTRL_ID_LEVEL_RANDOM_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM, + *gadget_level_random_value + step); + break; + case ED_CTRL_ID_LEVEL_RANDOM_TEXT: + *gadget_level_random_value = gi->text.number_value; + break; + + case ED_CTRL_ID_LEVEL_COLLECT_DOWN: + case ED_CTRL_ID_LEVEL_COLLECT_UP: + step *= (id == ED_CTRL_ID_LEVEL_COLLECT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT, + *gadget_level_collect_value + step); + break; + case ED_CTRL_ID_LEVEL_COLLECT_TEXT: + *gadget_level_collect_value = gi->text.number_value; + break; + + case ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN: + case ED_CTRL_ID_LEVEL_TIMELIMIT_UP: + step *= (id == ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT, + *gadget_level_timelimit_value + step); + break; + case ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT: + *gadget_level_timelimit_value = gi->text.number_value; + break; + + case ED_CTRL_ID_LEVEL_TIMESCORE_DOWN: + case ED_CTRL_ID_LEVEL_TIMESCORE_UP: + step *= (id == ED_CTRL_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1); + ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE, + *gadget_level_timescore_value + step); + break; + case ED_CTRL_ID_LEVEL_TIMESCORE_TEXT: + *gadget_level_timescore_value = gi->text.number_value; + break; + default: break; } @@ -3342,6 +3780,10 @@ static void HandleTextInputGadgets(struct GadgetInfo *gi) strcpy(level.name, gi->text.value); break; + case ED_CTRL_ID_LEVEL_AUTHOR: + strcpy(level.author, gi->text.value); + break; + default: break; } @@ -3355,7 +3797,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) int new_element; int player_present = FALSE; int level_changed = FALSE; - int x, y; + int i, x, y; new_element = (button == 1 ? new_element1 : button == 2 ? new_element2 : @@ -3471,6 +3913,29 @@ static void HandleControlButtons(struct GadgetInfo *gi) DrawMiniLevel(level_xpos, level_ypos); break; + case ED_CTRL_ID_ELEMENTLIST_UP: + case ED_CTRL_ID_ELEMENTLIST_DOWN: + step *= (id == ED_CTRL_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; + + UnmapGadget(gi); + getMiniGraphicSource(el2gfx(editor_element[element_shift + i]), + &design->pixmap, &design->x, &design->y); + MapGadget(gi); + } + break; + case ED_CTRL_ID_WRAP_LEFT: WrapLevel(-step, 0); break; @@ -3490,6 +3955,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) case ED_CTRL_ID_SINGLE_ITEMS: case ED_CTRL_ID_CONNECTED_ITEMS: case ED_CTRL_ID_LINE: + case ED_CTRL_ID_ARC: case ED_CTRL_ID_TEXT: case ED_CTRL_ID_RECTANGLE: case ED_CTRL_ID_FILLED_BOX: @@ -3539,7 +4005,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) case ED_CTRL_ID_INFO: if (edit_mode != ED_MODE_INFO) { - DrawControlWindow(); + DrawLevelInfoWindow(); edit_mode = ED_MODE_INFO; } else @@ -3742,13 +4208,6 @@ void HandleLevelEditorKeyInput(KeySym key) } } -/* 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) - void ClearEditorGadgetInfoText() { XFillRectangle(display, drawto, gc, @@ -3768,10 +4227,10 @@ void HandleEditorGadgetInfoText(void *ptr) if (edit_mode == ED_MODE_DRAWING && draw_with_brush) DeleteBrushFromCursor(); - if (gi == NULL || gi->description_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) @@ -3853,6 +4312,9 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) case ED_CTRL_ID_LINE: infotext = "Drawing line"; break; + case ED_CTRL_ID_ARC: + infotext = "Drawing arc"; + break; case ED_CTRL_ID_TEXT: infotext = "Setting text cursor"; break; @@ -3890,7 +4352,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) /* misuse this function to draw brush cursor, if needed */ if (edit_mode == ED_MODE_DRAWING && draw_with_brush && !button_status) { - if (IN_ED_FIELD(sx,sy) && IN_LEV_FIELD(lx, ly)) + if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly)) CopyBrushToCursor(sx, sy); else DeleteBrushFromCursor(); @@ -3901,6 +4363,6 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) "Amoeba content"); else DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW, - "Cruncher %d content: %d, %d", id - ED_CTRL_ID_ELEMCONT_0 + 1, - sx, sy); + "Cruncher %d content: %d, %d", + id - ED_CTRL_ID_ELEM_CONTENT_0 + 1, sx, sy); }