* editor.c *
***********************************************************/
+#include <math.h>
+
#include "editor.h"
#include "screens.h"
#include "tools.h"
#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_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
#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 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 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 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 53
+#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 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 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 60
+#define ED_NUM_GADGETS 64
/* 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_COUNTERBUTTONS 8
#define ED_NUM_SCROLLBUTTONS 4
#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;
"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,
"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,
"playfield height"
},
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 14 * MINI_TILEY,
+ 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,
"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,
"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,
} textinput_info[ED_NUM_TEXTINPUT] =
{
{
- ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS + 26 * MINI_TILEY,
+ ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(6),
ED_CTRL_ID_LEVEL_NAME,
level.name,
- "level title"
+ "Level Title"
+ },
+ {
+ ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(7),
+ ED_CTRL_ID_LEVEL_AUTHOR,
+ level.author,
+ "Level Author"
}
};
if (id == ED_CTRL_ID_SINGLE_ITEMS ||
id == ED_CTRL_ID_CONNECTED_ITEMS ||
id == ED_CTRL_ID_LINE ||
+ id == ED_CTRL_ID_ARC ||
id == ED_CTRL_ID_TEXT ||
id == ED_CTRL_ID_RECTANGLE ||
id == ED_CTRL_ID_FILLED_BOX ||
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 = ED_CTRL_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()
MapGadget(level_editor_gadget[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()
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);
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;
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()
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;
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:
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)
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);
strcpy(level.name, gi->text.value);
break;
+ case ED_CTRL_ID_LEVEL_AUTHOR:
+ strcpy(level.author, gi->text.value);
+ break;
+
default:
break;
}
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:
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;
/* 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();
projects / rocksndiamonds.git / blobdiff