* editor.c *
***********************************************************/
+#include <math.h>
+
#include "editor.h"
#include "screens.h"
#include "tools.h"
#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_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 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)
#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_SCROLL_HORIZONTAL_YSIZE ED_SCROLLBUTTON_YSIZE
/* control button identifiers */
-#define ED_CTRL_ID_NONE -1
-
-#define ED_CTRL_ID_SINGLE_ITEMS 0
-#define ED_CTRL_ID_CONNECTED_ITEMS 1
-#define ED_CTRL_ID_LINE 2
-#define ED_CTRL_ID_TEXT 3
-#define ED_CTRL_ID_RECTANGLE 4
-#define ED_CTRL_ID_FILLED_BOX 5
-#define ED_CTRL_ID_WRAP_UP 6
-#define ED_CTRL_ID_PROPERTIES 7
-#define ED_CTRL_ID_FLOOD_FILL 8
-#define ED_CTRL_ID_WRAP_LEFT 9
-#define ED_CTRL_ID_UNUSED1 10
-#define ED_CTRL_ID_WRAP_RIGHT 11
-#define ED_CTRL_ID_RANDOM_PLACEMENT 12
-#define ED_CTRL_ID_GRAB_BRUSH 13
-#define ED_CTRL_ID_WRAP_DOWN 14
-#define ED_CTRL_ID_PICK_ELEMENT 15
-#define ED_CTRL_ID_UNDO 16
-#define ED_CTRL_ID_INFO 17
-#define ED_CTRL_ID_SAVE 18
-#define ED_CTRL_ID_CLEAR 19
-#define ED_CTRL_ID_TEST 20
-#define ED_CTRL_ID_EXIT 21
+#define GADGET_ID_NONE -1
+
+#define GADGET_ID_SINGLE_ITEMS 0
+#define GADGET_ID_CONNECTED_ITEMS 1
+#define GADGET_ID_LINE 2
+#define GADGET_ID_ARC 3
+#define GADGET_ID_RECTANGLE 4
+#define GADGET_ID_FILLED_BOX 5
+#define GADGET_ID_WRAP_UP 6
+#define GADGET_ID_TEXT 7
+#define GADGET_ID_FLOOD_FILL 8
+#define GADGET_ID_WRAP_LEFT 9
+#define GADGET_ID_PROPERTIES 10
+#define GADGET_ID_WRAP_RIGHT 11
+#define GADGET_ID_RANDOM_PLACEMENT 12
+#define GADGET_ID_GRAB_BRUSH 13
+#define GADGET_ID_WRAP_DOWN 14
+#define GADGET_ID_PICK_ELEMENT 15
+#define GADGET_ID_UNDO 16
+#define GADGET_ID_INFO 17
+#define GADGET_ID_SAVE 18
+#define GADGET_ID_CLEAR 19
+#define GADGET_ID_TEST 20
+#define GADGET_ID_EXIT 21
/* counter button identifiers */
-#define ED_CTRL_ID_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_COLLECT_DOWN 34
-#define ED_CTRL_ID_LEVEL_COLLECT_TEXT 35
-#define ED_CTRL_ID_LEVEL_COLLECT_UP 36
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN 37
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT 38
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_UP 39
-#define ED_CTRL_ID_LEVEL_TIMESCORE_DOWN 40
-#define ED_CTRL_ID_LEVEL_TIMESCORE_TEXT 41
-#define ED_CTRL_ID_LEVEL_TIMESCORE_UP 42
+#define GADGET_ID_ELEM_SCORE_DOWN 22
+#define GADGET_ID_ELEM_SCORE_TEXT 23
+#define GADGET_ID_ELEM_SCORE_UP 24
+#define GADGET_ID_ELEM_CONTENT_DOWN 25
+#define GADGET_ID_ELEM_CONTENT_TEXT 26
+#define GADGET_ID_ELEM_CONTENT_UP 27
+#define GADGET_ID_LEVEL_XSIZE_DOWN 28
+#define GADGET_ID_LEVEL_XSIZE_TEXT 29
+#define GADGET_ID_LEVEL_XSIZE_UP 30
+#define GADGET_ID_LEVEL_YSIZE_DOWN 31
+#define GADGET_ID_LEVEL_YSIZE_TEXT 32
+#define GADGET_ID_LEVEL_YSIZE_UP 33
+#define GADGET_ID_LEVEL_RANDOM_DOWN 34
+#define GADGET_ID_LEVEL_RANDOM_TEXT 35
+#define GADGET_ID_LEVEL_RANDOM_UP 36
+#define GADGET_ID_LEVEL_COLLECT_DOWN 37
+#define GADGET_ID_LEVEL_COLLECT_TEXT 38
+#define GADGET_ID_LEVEL_COLLECT_UP 39
+#define GADGET_ID_LEVEL_TIMELIMIT_DOWN 40
+#define GADGET_ID_LEVEL_TIMELIMIT_TEXT 41
+#define GADGET_ID_LEVEL_TIMELIMIT_UP 42
+#define GADGET_ID_LEVEL_TIMESCORE_DOWN 43
+#define GADGET_ID_LEVEL_TIMESCORE_TEXT 44
+#define GADGET_ID_LEVEL_TIMESCORE_UP 45
/* drawing area identifiers */
-#define ED_CTRL_ID_DRAWING_LEVEL 43
-#define ED_CTRL_ID_ELEM_CONTENT_0 44
-#define ED_CTRL_ID_ELEM_CONTENT_1 45
-#define ED_CTRL_ID_ELEM_CONTENT_2 46
-#define ED_CTRL_ID_ELEM_CONTENT_3 47
-#define ED_CTRL_ID_ELEM_CONTENT_4 48
-#define ED_CTRL_ID_ELEM_CONTENT_5 49
-#define ED_CTRL_ID_ELEM_CONTENT_6 50
-#define ED_CTRL_ID_ELEM_CONTENT_7 51
-#define ED_CTRL_ID_AMOEBA_CONTENT 52
+#define GADGET_ID_DRAWING_LEVEL 46
+#define GADGET_ID_ELEM_CONTENT_0 47
+#define GADGET_ID_ELEM_CONTENT_1 48
+#define GADGET_ID_ELEM_CONTENT_2 49
+#define GADGET_ID_ELEM_CONTENT_3 50
+#define GADGET_ID_ELEM_CONTENT_4 51
+#define GADGET_ID_ELEM_CONTENT_5 52
+#define GADGET_ID_ELEM_CONTENT_6 53
+#define GADGET_ID_ELEM_CONTENT_7 54
+#define GADGET_ID_AMOEBA_CONTENT 55
/* text input identifiers */
-#define ED_CTRL_ID_LEVEL_NAME 53
+#define GADGET_ID_LEVEL_NAME 56
+#define GADGET_ID_LEVEL_AUTHOR 57
/* gadgets for scrolling of drawing area */
-#define ED_CTRL_ID_SCROLL_UP 54
-#define ED_CTRL_ID_SCROLL_DOWN 55
-#define ED_CTRL_ID_SCROLL_LEFT 56
-#define ED_CTRL_ID_SCROLL_RIGHT 57
-#define ED_CTRL_ID_SCROLL_VERTICAL 58
-#define ED_CTRL_ID_SCROLL_HORIZONTAL 59
+#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
+
+/* gadgets for scrolling element list */
+#define GADGET_ID_ELEMENTLIST_UP 64
+#define GADGET_ID_ELEMENTLIST_DOWN 65
+
+/* gadgets for buttons in element list */
+#define GADGET_ID_ELEMENTLIST_FIRST 66
+#define GADGET_ID_ELEMENTLIST_LAST 105
-#define ED_NUM_GADGETS 60
+#define NUM_EDITOR_GADGETS 106
/* 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_COLLECT 4
-#define ED_COUNTER_ID_LEVEL_TIMELIMIT 5
-#define ED_COUNTER_ID_LEVEL_TIMESCORE 6
+#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 7
-#define ED_NUM_SCROLLBUTTONS 4
+#define ED_NUM_COUNTERBUTTONS 8
+#define ED_NUM_SCROLLBUTTONS 6
#define ED_NUM_SCROLLBARS 2
-#define ED_NUM_TEXTINPUT 1
+#define ED_NUM_TEXTINPUT 2
/* values for CopyLevelToUndoBuffer() */
#define UNDO_IMMEDIATE 0
{ '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" },
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;
{
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_ID_ELEM_SCORE_DOWN, GADGET_ID_ELEM_SCORE_UP,
+ GADGET_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_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP,
+ GADGET_ID_ELEM_CONTENT_TEXT,
&gadget_elem_content_value,
"element content"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 6 * MINI_TILEY,
+ 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_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP,
+ GADGET_ID_LEVEL_XSIZE_TEXT,
&gadget_level_xsize_value,
"playfield width"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 10 * MINI_TILEY,
+ 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_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP,
+ GADGET_ID_LEVEL_YSIZE_TEXT,
&gadget_level_ysize_value,
"playfield height"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 14 * MINI_TILEY,
+ 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),
0, 999,
- ED_CTRL_ID_LEVEL_COLLECT_DOWN, ED_CTRL_ID_LEVEL_COLLECT_UP,
- ED_CTRL_ID_LEVEL_COLLECT_TEXT,
+ GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP,
+ GADGET_ID_LEVEL_COLLECT_TEXT,
&gadget_level_collect_value,
"number of emeralds to collect"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 18 * MINI_TILEY,
+ 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_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP,
+ GADGET_ID_LEVEL_TIMELIMIT_TEXT,
&gadget_level_timelimit_value,
"time available to solve level"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 22 * MINI_TILEY,
+ 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_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP,
+ GADGET_ID_LEVEL_TIMESCORE_TEXT,
&gadget_level_timescore_value,
"score for each 10 seconds left"
},
} textinput_info[ED_NUM_TEXTINPUT] =
{
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 26 * MINI_TILEY,
- ED_CTRL_ID_LEVEL_NAME,
+ ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(6),
+ GADGET_ID_LEVEL_NAME,
level.name,
- "level title"
+ "Level Title"
+ },
+ {
+ ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(7),
+ GADGET_ID_LEVEL_AUTHOR,
+ level.author,
+ "Level Author"
}
};
{
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS, ED_CTRL_ID_SCROLL_UP,
+ ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS,
+ GADGET_ID_SCROLL_UP,
"scroll level editing area up"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 1 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS, ED_CTRL_ID_SCROLL_DOWN,
+ ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS,
+ GADGET_ID_SCROLL_DOWN,
"scroll level editing area down"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 2 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS, ED_CTRL_ID_SCROLL_LEFT,
+ ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS,
+ GADGET_ID_SCROLL_LEFT,
"scroll level editing area left"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 3 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS, ED_CTRL_ID_SCROLL_RIGHT,
+ ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS,
+ GADGET_ID_SCROLL_RIGHT,
"scroll level editing area right"
+ },
+ {
+ ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
+ ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
+ GADGET_ID_ELEMENTLIST_UP,
+ "scroll element list up"
+ },
+ {
+ 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"
}
};
int width, height;
int type;
int gadget_id;
- char *text;
+ char *infotext;
} scrollbar_info[ED_NUM_SCROLLBARS] =
{
{
ED_SCROLL_VERTICAL_XPOS, ED_SCROLL_VERTICAL_YPOS,
ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE,
GD_TYPE_SCROLLBAR_VERTICAL,
- ED_CTRL_ID_SCROLL_VERTICAL,
+ GADGET_ID_SCROLL_VERTICAL,
"scroll level editing area vertically"
},
{
ED_SCROLL_HORIZONTAL_XPOS, ED_SCROLL_HORIZONTAL_YPOS,
ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE,
GD_TYPE_SCROLLBAR_HORIZONTAL,
- ED_CTRL_ID_SCROLL_HORIZONTAL,
+ GADGET_ID_SCROLL_HORIZONTAL,
"scroll level editing area horizontally"
},
};
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 struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
-static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
-static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static int drawing_function = GADGET_ID_SINGLE_ITEMS;
+static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
static boolean draw_with_brush = FALSE;
static int properties_element = 0;
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'),
BackToFront();
}
-void InitLevelEditorGadgets()
-{
- int i;
-
- for (i=0; i<ED_NUM_GADGETS; i++)
- level_editor_gadget[i] = NULL;
-}
-
static void CreateControlButtons()
{
Pixmap gd_pixmap = pix[PIX_DOOR];
int gd_x1, gd_x2, gd_y1, gd_y2;
int button_type;
int radio_button_nr;
- boolean radio_button_pressed;
-
- if (id == ED_CTRL_ID_SINGLE_ITEMS ||
- id == ED_CTRL_ID_CONNECTED_ITEMS ||
- id == ED_CTRL_ID_LINE ||
- id == ED_CTRL_ID_TEXT ||
- id == ED_CTRL_ID_RECTANGLE ||
- id == ED_CTRL_ID_FILLED_BOX ||
- id == ED_CTRL_ID_FLOOD_FILL ||
- id == ED_CTRL_ID_GRAB_BRUSH ||
- id == ED_CTRL_ID_PICK_ELEMENT)
+ boolean checked;
+
+ if (id == GADGET_ID_SINGLE_ITEMS ||
+ id == GADGET_ID_CONNECTED_ITEMS ||
+ id == GADGET_ID_LINE ||
+ id == GADGET_ID_ARC ||
+ id == GADGET_ID_TEXT ||
+ id == GADGET_ID_RECTANGLE ||
+ id == GADGET_ID_FILLED_BOX ||
+ id == GADGET_ID_FLOOD_FILL ||
+ id == GADGET_ID_GRAB_BRUSH ||
+ id == GADGET_ID_PICK_ELEMENT)
{
button_type = GD_TYPE_RADIO_BUTTON;
radio_button_nr = 1;
- radio_button_pressed = (id == drawing_function ? TRUE : FALSE);
+ checked = (id == drawing_function ? TRUE : FALSE);
event_mask = GD_EVENT_PRESSED;
}
else
{
button_type = GD_TYPE_NORMAL_BUTTON;
radio_button_nr = 0;
- radio_button_pressed = FALSE;
+ checked = FALSE;
- if (id == ED_CTRL_ID_WRAP_LEFT ||
- id == ED_CTRL_ID_WRAP_RIGHT ||
- id == ED_CTRL_ID_WRAP_UP ||
- id == ED_CTRL_ID_WRAP_DOWN)
+ if (id == GADGET_ID_WRAP_LEFT ||
+ id == GADGET_ID_WRAP_RIGHT ||
+ id == GADGET_ID_WRAP_UP ||
+ id == GADGET_ID_WRAP_DOWN)
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
else
event_mask = GD_EVENT_RELEASED;
GDI_TYPE, button_type,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_RADIO_NR, radio_button_nr,
- GDI_RADIO_PRESSED, radio_button_pressed,
+ GDI_CHECKED, checked,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1,
GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2,
level_editor_gadget[id] = gi;
}
- /* create buttons for scrolling of drawing area */
+ /* create buttons for scrolling of drawing area and element list */
for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
{
int id = scrollbutton_info[i].gadget_id;
- int gd_x1, gd_x2, gd_y;
+ int x, y, width, height;
+ int gd_x1, gd_x2, gd_y1, gd_y2;
+
+ x = scrollbutton_info[i].x;
+ y = scrollbutton_info[i].y;
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
- gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ if (id == GADGET_ID_ELEMENTLIST_UP ||
+ id == GADGET_ID_ELEMENTLIST_DOWN)
+ {
+ x += DX;
+ y += DY;
+ width = ED_ELEMENTLIST_UPDOWN_XSIZE;
+ height = ED_ELEMENTLIST_UPDOWN_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].y;
+ gd_x2 = gd_x1;
+ gd_y2 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ }
+ else
+ {
+ x += SX;
+ y += SY;
+ width = ED_SCROLLBUTTON_XSIZE;
+ height = ED_SCROLLBUTTON_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_y2 = gd_y1;
+ }
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
- GDI_X, SX + scrollbutton_info[i].x,
- GDI_Y, SY + scrollbutton_info[i].y,
- GDI_WIDTH, ED_SCROLLBUTTON_XSIZE,
- GDI_HEIGHT, ED_SCROLLBUTTON_YSIZE,
+ GDI_X, x,
+ GDI_Y, y,
+ GDI_WIDTH, width,
+ GDI_HEIGHT, height,
+ GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+ GDI_STATE, GD_BUTTON_UNPRESSED,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+
+ /* create buttons for element list */
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ {
+ Pixmap deco_pixmap;
+ int deco_x, deco_y, deco_xpos, deco_ypos;
+ int gd_xoffset, gd_yoffset;
+ int gd_x, gd_y1, gd_y2;
+ int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
+ int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
+ int id = GADGET_ID_ELEMENTLIST_FIRST + i;
+
+ event_mask = GD_EVENT_RELEASED;
+
+ gd_xoffset = ED_ELEMENTLIST_XPOS + x * ED_ELEMENTLIST_XSIZE;
+ gd_yoffset = ED_ELEMENTLIST_YPOS + y * ED_ELEMENTLIST_YSIZE;
+
+ gd_x = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+ gd_y1 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
+ gd_y2 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_ALT_YPOS;
+
+ getMiniGraphicSource(el2gfx(editor_element[i]),
+ &deco_pixmap, &deco_x, &deco_y);
+ deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
+ deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_INFO_TEXT, "choose element",
+ GDI_X, DX + gd_xoffset,
+ GDI_Y, DY + gd_yoffset,
+ GDI_WIDTH, ED_ELEMENTLIST_XSIZE,
+ GDI_HEIGHT, ED_ELEMENTLIST_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
+ GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
+ GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+ GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
+ GDI_DECORATION_SHIFTING, 1, 1,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
GD_EVENT_OFF_BORDERS;
/* one for the level drawing area ... */
- id = ED_CTRL_ID_DRAWING_LEVEL;
+ id = GADGET_ID_DRAWING_LEVEL;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX,
GDI_Y, SY,
int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
- id = ED_CTRL_ID_ELEM_CONTENT_0 + i;
+ id = GADGET_ID_ELEM_CONTENT_0 + i;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, gx,
GDI_Y, gy,
}
/* ... and one for the amoeba content */
- id = ED_CTRL_ID_AMOEBA_CONTENT;
+ id = GADGET_ID_AMOEBA_CONTENT;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX + ED_AREA_ELEM_CONTENT_XPOS,
GDI_Y, SY + ED_AREA_ELEM_CONTENT_YPOS,
static void CreateTextInputGadgets()
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
- int gd_x, gd_y;
- struct GadgetInfo *gi;
- unsigned long event_mask;
- char infotext[MAX_INFOTEXT_LEN + 1];
- int i, id;
+ int i;
- /* text input gadget for the level name */
- i = ED_TEXTINPUT_ID_LEVEL_NAME;
- id = ED_CTRL_ID_LEVEL_NAME;
+ for (i=0; i<ED_NUM_TEXTINPUT; i++)
+ {
+ Pixmap gd_pixmap = pix[PIX_DOOR];
+ int gd_x, gd_y;
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
+ char infotext[1024];
+ int id = GADGET_ID_LEVEL_NAME + i;
- event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+ event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
- gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+ gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
- sprintf(infotext, "Enter %s", textinput_info[i].infotext);
+ sprintf(infotext, "Enter %s", textinput_info[i].infotext);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
- gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_INFO_TEXT, infotext,
- GDI_X, SX + textinput_info[i].x,
- GDI_Y, SY + textinput_info[i].y,
- GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
- GDI_TEXT_VALUE, textinput_info[i].value,
- GDI_TEXT_SIZE, 30,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
- GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleTextInputGadgets,
- GDI_END);
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_INFO_TEXT, infotext,
+ GDI_X, SX + textinput_info[i].x,
+ GDI_Y, SY + textinput_info[i].y,
+ GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
+ GDI_TEXT_VALUE, textinput_info[i].value,
+ GDI_TEXT_SIZE, 30,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
+ GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleTextInputGadgets,
+ GDI_END);
- if (gi == NULL)
- Error(ERR_EXIT, "cannot create gadget");
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
- level_editor_gadget[id] = gi;
+ level_editor_gadget[id] = gi;
+ }
}
static void CreateScrollbarGadgets()
gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_INFO_TEXT, scrollbar_info[i].text,
+ GDI_INFO_TEXT, scrollbar_info[i].infotext,
GDI_X, SX + scrollbar_info[i].x,
GDI_Y, SY + scrollbar_info[i].y,
GDI_WIDTH, scrollbar_info[i].width,
}
}
-static void CreateLevelEditorGadgets()
+void CreateLevelEditorGadgets()
{
- if (level_editor_gadgets_created)
- return;
-
CreateControlButtons();
CreateCounterButtons();
CreateDrawingAreas();
CreateTextInputGadgets();
CreateScrollbarGadgets();
-
- level_editor_gadgets_created = TRUE;
}
static void MapControlButtons()
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
MapGadget(level_editor_gadget[i]);
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
}
-static void MapCounterButtons(int cnt_id)
+static void MapCounterButtons(int id)
{
- MapGadget(level_editor_gadget[counterbutton_info[cnt_id].gadget_id_down]);
- MapGadget(level_editor_gadget[counterbutton_info[cnt_id].gadget_id_text]);
- MapGadget(level_editor_gadget[counterbutton_info[cnt_id].gadget_id_up]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
}
static void MapDrawingArea(int id)
static void MapTextInputGadget(int id)
{
- MapGadget(level_editor_gadget[id]);
+ MapGadget(level_editor_gadget[textinput_info[id].gadget_id]);
}
static void MapMainDrawingArea()
for (i=0; i<ED_NUM_SCROLLBARS; i++)
MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
- MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+ MapDrawingArea(GADGET_ID_DRAWING_LEVEL);
}
static void UnmapDrawingArea(int id)
{
int i;
- for (i=ED_NUM_CTRL_BUTTONS; i<ED_NUM_GADGETS; i++)
- UnmapGadget(level_editor_gadget[i]);
+ for (i=0; i<NUM_EDITOR_GADGETS; i++)
+ if (level_editor_gadget[i]->x < DX)
+ UnmapGadget(level_editor_gadget[i]);
}
void UnmapLevelEditorGadgets()
{
int i;
- for (i=0; i<ED_NUM_GADGETS; i++)
+ for (i=0; i<NUM_EDITOR_GADGETS; i++)
UnmapGadget(level_editor_gadget[i]);
}
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[GADGET_ID_LEVEL_NAME]->text.value, level.name);
MapControlButtons();
struct GadgetInfo *gi = level_editor_gadget[id];
int items_max, items_visible, item_position;
- if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
+ if (id == GADGET_ID_SCROLL_HORIZONTAL)
{
items_max = MAX(lev_fieldx + 2, ED_FIELDX);
items_visible = ED_FIELDX;
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);
}
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;
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;
DrawPropertiesWindow();
}
}
+#endif
+
+
if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/
{
ascii = '_';
#endif
- if (ascii && len<MAX_LEVNAMLEN-2)
+ if (ascii && len<MAX_LEVEL_NAME_LEN-2)
{
level.name[len] = ascii;
level.name[len+1] = 0;
ClearWindow();
UnmapLevelEditorWindowGadgets();
AdjustLevelScrollPosition();
- AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_HORIZONTAL);
- AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_VERTICAL);
+ AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
+ AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
DrawMiniLevel(level_xpos, level_ypos);
MapMainDrawingArea();
}
static void DrawLevelInfoWindow()
{
- char infotext[MAX_INFOTEXT_LEN + 1];
+ char infotext[1024];
int infotext_yoffset = MINI_TILEX + ED_GADGET_DISTANCE;
int i, x, y;
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];
y = counterbutton_info[i].y - infotext_yoffset;
sprintf(infotext, "%s:", counterbutton_info[i].infotext);
- DrawTextF(x, y, FC_YELLOW, infotext);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
+ DrawTextF(x, y, FC_YELLOW, infotext);
ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
MapCounterButtons(i);
}
- /* draw level name text input gadget */
- x = textinput_info[ED_TEXTINPUT_ID_LEVEL_NAME].x;
- y = textinput_info[ED_TEXTINPUT_ID_LEVEL_NAME].y - infotext_yoffset;
- DrawTextF(x, y, FC_YELLOW, "Level Title:");
- MapTextInputGadget(ED_CTRL_ID_LEVEL_NAME);
+ /* draw text input gadgets for level info */
+ for (i=ED_TEXTINPUT_ID_LEVEL_NAME; i<=ED_TEXTINPUT_ID_LEVEL_AUTHOR; i++)
+ {
+ x = textinput_info[i].x;
+ y = textinput_info[i].y - infotext_yoffset;
+
+ sprintf(infotext, "%s:", textinput_info[i].infotext);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
+
+ DrawTextF(x, y, FC_YELLOW, infotext);
+ ModifyEditorTextInput(i, textinput_info[i].value);
+ MapTextInputGadget(i);
+ }
}
static void DrawElementContentAreas()
ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
for (i=0; i<MAX_ELEM_CONTENT; i++)
- UnmapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
+ UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
/* display counter to choose number of element content areas */
gadget_elem_content_value = num_areas;
}
for (i=0; i<*num_areas; i++)
- MapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
+ MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
}
static void DrawAmoebaContentArea()
DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
- MapDrawingArea(ED_CTRL_ID_AMOEBA_CONTENT);
+ MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
}
#define TEXT_COLLECTING "Score for collecting"
for (x=0; x<=len_x; x++)
{
- int y = (int)(a * x + 0.5) * (to_y < from_y ? -1 : +1);
-
+ y = (int)(a * x + 0.5) * (to_y < from_y ? -1 : +1);
DrawLineElement(from_x + x, from_y + y, element, change_level);
}
}
for (y=0; y<=len_y; y++)
{
- int x = (int)(a * y + 0.5) * (to_x < from_x ? -1 : +1);
-
+ x = (int)(a * y + 0.5) * (to_x < from_x ? -1 : +1);
DrawLineElement(from_x + x, from_y + y, element, change_level);
}
}
DrawLine(from_x, y, to_x, y, element, change_level);
}
+static void DrawArcExt(int from_x, int from_y, int to_x2, int to_y2,
+ int element, boolean change_level)
+{
+ int to_x = to_x2 - (to_x2 > 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;
boolean inside_drawing_area = !gi->event.off_borders;
boolean button_press_event;
boolean button_release_event;
- boolean draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL);
+ boolean draw_level = (id == GADGET_ID_DRAWING_LEVEL);
int new_element;
int button = gi->event.button;
int sx = gi->event.x, sy = gi->event.y;
#endif
- if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
+ if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
return;
switch (drawing_function)
{
- case ED_CTRL_ID_SINGLE_ITEMS:
+ case GADGET_ID_SINGLE_ITEMS:
if (draw_level)
{
if (button_release_event)
gi->y + sy * MINI_TILEY,
el2gfx(new_element));
- if (id == ED_CTRL_ID_AMOEBA_CONTENT)
+ if (id == GADGET_ID_AMOEBA_CONTENT)
level.amoebe_inhalt = new_element;
- else if (id >= ED_CTRL_ID_ELEM_CONTENT_0 &&
- id <= ED_CTRL_ID_ELEM_CONTENT_7)
- level.mampfer_inhalt[id - ED_CTRL_ID_ELEM_CONTENT_0][sx][sy] =
+ else if (id >= GADGET_ID_ELEM_CONTENT_0 &&
+ id <= GADGET_ID_ELEM_CONTENT_7)
+ level.mampfer_inhalt[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
new_element;
}
break;
- case ED_CTRL_ID_CONNECTED_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
{
static int last_sx = -1;
static int last_sy = -1;
}
break;
- case ED_CTRL_ID_LINE:
- case ED_CTRL_ID_RECTANGLE:
- case ED_CTRL_ID_FILLED_BOX:
- case ED_CTRL_ID_GRAB_BRUSH:
- case ED_CTRL_ID_TEXT:
+ case GADGET_ID_LINE:
+ case GADGET_ID_ARC:
+ case GADGET_ID_RECTANGLE:
+ case GADGET_ID_FILLED_BOX:
+ case GADGET_ID_GRAB_BRUSH:
+ case GADGET_ID_TEXT:
{
static int last_sx = -1;
static int last_sy = -1;
static int start_sy = -1;
void (*draw_func)(int, int, int, int, int, boolean);
- if (drawing_function == ED_CTRL_ID_LINE)
+ if (drawing_function == GADGET_ID_LINE)
draw_func = DrawLine;
- else if (drawing_function == ED_CTRL_ID_RECTANGLE)
+ else if (drawing_function == GADGET_ID_ARC)
+ draw_func = DrawArc;
+ else if (drawing_function == GADGET_ID_RECTANGLE)
draw_func = DrawRectangle;
- else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
+ else if (drawing_function == GADGET_ID_FILLED_BOX)
draw_func = DrawFilledBox;
- else if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+ else if (drawing_function == GADGET_ID_GRAB_BRUSH)
draw_func = SelectArea;
- else /* (drawing_function == ED_CTRL_ID_TEXT) */
+ else /* (drawing_function == GADGET_ID_TEXT) */
draw_func = SetTextCursor;
if (button_press_event)
start_sx = last_sx = sx;
start_sy = last_sy = sy;
- if (drawing_function == ED_CTRL_ID_TEXT)
+ if (drawing_function == GADGET_ID_TEXT)
DrawLevelText(0, 0, 0, TEXT_END);
}
else if (button_release_event)
{
draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
- if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+ if (drawing_function == GADGET_ID_GRAB_BRUSH)
{
CopyAreaToBrush(start_sx, start_sy, sx, sy, button);
CopyBrushToCursor(sx, sy);
- ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]);
draw_with_brush = TRUE;
}
- else if (drawing_function == ED_CTRL_ID_TEXT)
+ else if (drawing_function == GADGET_ID_TEXT)
DrawLevelText(sx, sy, 0, TEXT_INIT);
else
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
#if 0
- case ED_CTRL_ID_TEXT:
+ case GADGET_ID_TEXT:
/*
DrawMiniElement(last_sx, last_sy, Feld[lx][ly]);
DrawAreaBorder(sx, sy, sx, sy);
- case ED_CTRL_ID_FLOOD_FILL:
+ case GADGET_ID_FLOOD_FILL:
if (button_press_event && Feld[lx][ly] != new_element)
{
FloodFill(lx, ly, new_element);
}
break;
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_PICK_ELEMENT:
if (button_press_event)
PickDrawingElement(button, Feld[lx][ly]);
if (button_release_event)
switch (id)
{
- case ED_CTRL_ID_ELEM_SCORE_DOWN:
- case ED_CTRL_ID_ELEM_SCORE_UP:
- step *= (id == ED_CTRL_ID_ELEM_SCORE_DOWN ? -1 : 1);
+ 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 ED_CTRL_ID_ELEM_SCORE_TEXT:
+ case GADGET_ID_ELEM_SCORE_TEXT:
*gadget_elem_score_value = gi->text.number_value;
break;
- case ED_CTRL_ID_ELEM_CONTENT_DOWN:
- case ED_CTRL_ID_ELEM_CONTENT_UP:
- step *= (id == ED_CTRL_ID_ELEM_CONTENT_DOWN ? -1 : 1);
+ 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 ED_CTRL_ID_ELEM_CONTENT_TEXT:
+ case GADGET_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);
+ 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 ED_CTRL_ID_LEVEL_XSIZE_TEXT:
+ case GADGET_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);
+ 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 ED_CTRL_ID_LEVEL_YSIZE_TEXT:
+ case GADGET_ID_LEVEL_YSIZE_TEXT:
*gadget_level_ysize_value = gi->text.number_value;
level.fieldy = lev_fieldy;
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);
+ 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;
+
+ 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 ED_CTRL_ID_LEVEL_COLLECT_TEXT:
+ case GADGET_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);
+ 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 ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT:
+ case GADGET_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);
+ 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 ED_CTRL_ID_LEVEL_TIMESCORE_TEXT:
+ case GADGET_ID_LEVEL_TIMESCORE_TEXT:
*gadget_level_timescore_value = gi->text.number_value;
break;
switch (id)
{
- case ED_CTRL_ID_LEVEL_NAME:
+ case GADGET_ID_LEVEL_NAME:
strcpy(level.name, gi->text.value);
break;
+ case GADGET_ID_LEVEL_AUTHOR:
+ strcpy(level.author, gi->text.value);
+ break;
+
default:
break;
}
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 :
button == 3 ? new_element3 : 0);
- if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
+ if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
DrawLevelText(0, 0, 0, TEXT_END);
- if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES &&
+ if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES &&
edit_mode != ED_MODE_DRAWING)
{
DrawDrawingWindow();
switch (id)
{
- case ED_CTRL_ID_SCROLL_LEFT:
+ case GADGET_ID_SCROLL_LEFT:
if (level_xpos >= 0)
{
- int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
struct GadgetScrollbar *gs = &gi->scrollbar;
}
break;
- case ED_CTRL_ID_SCROLL_RIGHT:
+ case GADGET_ID_SCROLL_RIGHT:
if (level_xpos <= lev_fieldx - ED_FIELDX)
{
- int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
struct GadgetScrollbar *gs = &gi->scrollbar;
}
break;
- case ED_CTRL_ID_SCROLL_UP:
+ case GADGET_ID_SCROLL_UP:
if (level_ypos >= 0)
{
- int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ int gadget_id = GADGET_ID_SCROLL_VERTICAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
struct GadgetScrollbar *gs = &gi->scrollbar;
}
break;
- case ED_CTRL_ID_SCROLL_DOWN:
+ case GADGET_ID_SCROLL_DOWN:
if (level_ypos <= lev_fieldy - ED_FIELDY)
{
- int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ int gadget_id = GADGET_ID_SCROLL_VERTICAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
struct GadgetScrollbar *gs = &gi->scrollbar;
}
break;
- case ED_CTRL_ID_SCROLL_HORIZONTAL:
+ case GADGET_ID_SCROLL_HORIZONTAL:
level_xpos = gi->event.item_position - 1;
DrawMiniLevel(level_xpos, level_ypos);
break;
- case ED_CTRL_ID_SCROLL_VERTICAL:
+ case GADGET_ID_SCROLL_VERTICAL:
level_ypos = gi->event.item_position - 1;
DrawMiniLevel(level_xpos, level_ypos);
break;
- case ED_CTRL_ID_WRAP_LEFT:
+ case GADGET_ID_ELEMENTLIST_UP:
+ case GADGET_ID_ELEMENTLIST_DOWN:
+ step *= (id == GADGET_ID_ELEMENTLIST_UP ? -1 : +1);
+ element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+
+ if (element_shift < 0)
+ element_shift = 0;
+ if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
+ element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ {
+ int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetDesign *design = &gi->deco.design;
+
+ UnmapGadget(gi);
+ getMiniGraphicSource(el2gfx(editor_element[element_shift + i]),
+ &design->pixmap, &design->x, &design->y);
+ MapGadget(gi);
+ }
+ break;
+
+ case GADGET_ID_WRAP_LEFT:
WrapLevel(-step, 0);
break;
- case ED_CTRL_ID_WRAP_RIGHT:
+ case GADGET_ID_WRAP_RIGHT:
WrapLevel(step, 0);
break;
- case ED_CTRL_ID_WRAP_UP:
+ case GADGET_ID_WRAP_UP:
WrapLevel(0, -step);
break;
- case ED_CTRL_ID_WRAP_DOWN:
+ case GADGET_ID_WRAP_DOWN:
WrapLevel(0, step);
break;
- case ED_CTRL_ID_SINGLE_ITEMS:
- case ED_CTRL_ID_CONNECTED_ITEMS:
- case ED_CTRL_ID_LINE:
- case ED_CTRL_ID_TEXT:
- case ED_CTRL_ID_RECTANGLE:
- case ED_CTRL_ID_FILLED_BOX:
- case ED_CTRL_ID_FLOOD_FILL:
- case ED_CTRL_ID_GRAB_BRUSH:
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_SINGLE_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
+ case GADGET_ID_LINE:
+ case GADGET_ID_ARC:
+ case GADGET_ID_TEXT:
+ case GADGET_ID_RECTANGLE:
+ case GADGET_ID_FILLED_BOX:
+ case GADGET_ID_FLOOD_FILL:
+ case GADGET_ID_GRAB_BRUSH:
+ case GADGET_ID_PICK_ELEMENT:
last_drawing_function = drawing_function;
drawing_function = id;
draw_with_brush = FALSE;
break;
- case ED_CTRL_ID_RANDOM_PLACEMENT:
+ case GADGET_ID_RANDOM_PLACEMENT:
RandomPlacement(button);
break;
- case ED_CTRL_ID_PROPERTIES:
+ case GADGET_ID_PROPERTIES:
if (edit_mode != ED_MODE_PROPERTIES)
{
properties_element = new_element;
}
break;
- case ED_CTRL_ID_UNDO:
+ case GADGET_ID_UNDO:
if (undo_buffer_steps == 0)
{
Request("Undo buffer empty !", REQ_CONFIRM);
DrawMiniLevel(level_xpos,level_ypos);
break;
- case ED_CTRL_ID_INFO:
+ case GADGET_ID_INFO:
if (edit_mode != ED_MODE_INFO)
{
DrawLevelInfoWindow();
}
break;
- case ED_CTRL_ID_CLEAR:
+ case GADGET_ID_CLEAR:
for(x=0; x<MAX_LEV_FIELDX; x++)
for(y=0; y<MAX_LEV_FIELDY; y++)
Feld[x][y] = new_element3;
- CopyLevelToUndoBuffer(ED_CTRL_ID_CLEAR);
+ CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
DrawMiniLevel(level_xpos, level_ypos);
break;
- case ED_CTRL_ID_SAVE:
+ case GADGET_ID_SAVE:
if (leveldir[leveldir_nr].readonly)
{
Request("This level is read only !", REQ_CONFIRM);
}
break;
- case ED_CTRL_ID_TEST:
+ case GADGET_ID_TEST:
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
if (Feld[x][y] == EL_SPIELFIGUR ||
}
break;
- case ED_CTRL_ID_EXIT:
+ case GADGET_ID_EXIT:
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
if (Feld[x][y] != Ur[x][y])
{
char letter = getCharFromKeySym(key);
- if (drawing_function == ED_CTRL_ID_TEXT)
+ if (drawing_function == GADGET_ID_TEXT)
{
if (letter)
DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
switch (key)
{
case XK_Left:
- id = ED_CTRL_ID_SCROLL_LEFT;
+ id = GADGET_ID_SCROLL_LEFT;
break;
case XK_Right:
- id = ED_CTRL_ID_SCROLL_RIGHT;
+ id = GADGET_ID_SCROLL_RIGHT;
break;
case XK_Up:
- id = ED_CTRL_ID_SCROLL_UP;
+ id = GADGET_ID_SCROLL_UP;
break;
case XK_Down:
- id = ED_CTRL_ID_SCROLL_DOWN;
+ id = GADGET_ID_SCROLL_DOWN;
break;
default:
- id = ED_CTRL_ID_NONE;
+ id = GADGET_ID_NONE;
break;
}
- if (id != ED_CTRL_ID_NONE)
+ if (id != GADGET_ID_NONE)
ClickOnGadget(level_editor_gadget[id]);
else if (letter == '.')
- ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]);
else
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
if (letter && letter == control_info[i].shortcut)
{
sprintf(shortcut, " ('%s%c')",
(key >= 'A' && key <= 'Z' ? "Shift-" :
- gi->custom_id == ED_CTRL_ID_SINGLE_ITEMS ? ".' or '" : ""),
+ gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""),
key);
if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
ClearEditorGadgetInfoText();
- if (id == ED_CTRL_ID_DRAWING_LEVEL)
+ if (id == GADGET_ID_DRAWING_LEVEL)
{
if (button_status)
{
switch (drawing_function)
{
- case ED_CTRL_ID_SINGLE_ITEMS:
+ case GADGET_ID_SINGLE_ITEMS:
infotext = "Drawing single items";
break;
- case ED_CTRL_ID_CONNECTED_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
infotext = "Drawing connected items";
break;
- case ED_CTRL_ID_LINE:
+ case GADGET_ID_LINE:
infotext = "Drawing line";
break;
- case ED_CTRL_ID_TEXT:
+ case GADGET_ID_ARC:
+ infotext = "Drawing arc";
+ break;
+ case GADGET_ID_TEXT:
infotext = "Setting text cursor";
break;
- case ED_CTRL_ID_RECTANGLE:
+ case GADGET_ID_RECTANGLE:
infotext = "Drawing rectangle";
break;
- case ED_CTRL_ID_FILLED_BOX:
+ case GADGET_ID_FILLED_BOX:
infotext = "Drawing filled box";
break;
- case ED_CTRL_ID_FLOOD_FILL:
+ case GADGET_ID_FLOOD_FILL:
infotext = "Flood fill";
break;
- case ED_CTRL_ID_GRAB_BRUSH:
+ case GADGET_ID_GRAB_BRUSH:
infotext = "Grabbing brush";
break;
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_PICK_ELEMENT:
infotext = "Picking element";
break;
/* 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();
}
}
- else if (id == ED_CTRL_ID_AMOEBA_CONTENT)
+ else if (id == GADGET_ID_AMOEBA_CONTENT)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Amoeba content");
else
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Cruncher %d content: %d, %d",
- id - ED_CTRL_ID_ELEM_CONTENT_0 + 1, sx, sy);
+ id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
}
projects / rocksndiamonds.git / blobdiff