* editor.c *
***********************************************************/
+#include <math.h>
+
#include "editor.h"
#include "screens.h"
#include "tools.h"
#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
/* values for elements with content */
-#define MAX_ELEMCONT 8
+#define MIN_ELEM_CONTENT 1
+#define MAX_ELEM_CONTENT 8
/* values for the control window */
#define ED_CTRL_BUTTONS_GFX_YPOS 236
#define ED_CTRL_BUTTONS_ALT_GFX_YPOS 142
-#define ED_CTRL1_BUTTONS_HORIZ 4
-#define ED_CTRL1_BUTTONS_VERT 4
-#define ED_CTRL1_BUTTON_XSIZE 22
-#define ED_CTRL1_BUTTON_YSIZE 22
-#define ED_CTRL1_BUTTONS_XPOS 6
-#define ED_CTRL1_BUTTONS_YPOS 6
-#define ED_CTRL2_BUTTONS_HORIZ 3
-#define ED_CTRL2_BUTTONS_VERT 2
-#define ED_CTRL2_BUTTON_XSIZE 30
-#define ED_CTRL2_BUTTON_YSIZE 20
-#define ED_CTRL2_BUTTONS_XPOS 5
-#define ED_CTRL2_BUTTONS_YPOS 100
+#define ED_CTRL1_BUTTONS_HORIZ 4
+#define ED_CTRL1_BUTTONS_VERT 4
+#define ED_CTRL1_BUTTON_XSIZE 22
+#define ED_CTRL1_BUTTON_YSIZE 22
+#define ED_CTRL1_BUTTONS_XPOS 6
+#define ED_CTRL1_BUTTONS_YPOS 6
+#define ED_CTRL2_BUTTONS_HORIZ 3
+#define ED_CTRL2_BUTTONS_VERT 2
+#define ED_CTRL2_BUTTON_XSIZE 30
+#define ED_CTRL2_BUTTON_YSIZE 20
+#define ED_CTRL2_BUTTONS_XPOS 5
+#define ED_CTRL2_BUTTONS_YPOS 100
#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 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
/* 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
#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_EXIT 21
/* counter button identifiers */
-#define ED_CTRL_ID_SCORE_DOWN 22
-#define ED_CTRL_ID_SCORE_UP 23
-#define ED_CTRL_ID_ELEMCONT_DOWN 24
-#define ED_CTRL_ID_ELEMCONT_UP 25
+#define 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 26
-#define ED_CTRL_ID_ELEMCONT_0 27
-#define ED_CTRL_ID_ELEMCONT_7 34
-#define ED_CTRL_ID_AMOEBA_CONTENT 35
+#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 36
+#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 37
-#define ED_CTRL_ID_SCROLL_DOWN 38
-#define ED_CTRL_ID_SCROLL_LEFT 39
-#define ED_CTRL_ID_SCROLL_RIGHT 40
-#define ED_CTRL_ID_SCROLL_VERTICAL 41
-#define ED_CTRL_ID_SCROLL_HORIZONTAL 42
+#define ED_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 43
+#define ED_NUM_GADGETS 64
/* values for counter gadgets */
-#define ED_COUNTER_SCORE 0
-#define ED_COUNTER_ELEMCONT 1
-
-#define ED_NUM_COUNTERBUTTONS 2
+#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 4
#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;
{ '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" },
{ 'E', "exit level editor" }
};
+/* pointers to counter values */
+static int *gadget_elem_score_value = NULL;
+static int *gadget_elem_content_value = NULL;
+static int *gadget_level_xsize_value = NULL;
+static int *gadget_level_ysize_value = NULL;
+static int *gadget_level_random_value = NULL;
+static int *gadget_level_collect_value = NULL;
+static int *gadget_level_timelimit_value = NULL;
+static int *gadget_level_timescore_value = NULL;
+
static struct
{
int x, y;
- int gadget_id;
+ int min_value, max_value;
+ int gadget_id_down, gadget_id_up;
+ int gadget_id_text;
+ int **counter_value;
+ char *infotext;
} counterbutton_info[ED_NUM_COUNTERBUTTONS] =
{
- { ED_COUNT_SCORE_XPOS, ED_COUNT_SCORE_YPOS, ED_CTRL_ID_SCORE_DOWN },
- { ED_COUNT_ELEMCONT_XPOS, ED_COUNT_ELEMCONT_YPOS, ED_CTRL_ID_ELEMCONT_DOWN }
+ {
+ ED_COUNT_ELEM_SCORE_XPOS, ED_COUNT_ELEM_SCORE_YPOS,
+ MIN_SCORE, MAX_SCORE,
+ 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
int xpos, ypos;
int x, y;
int gadget_id;
- char *text;
+ char *infotext;
} scrollbutton_info[ED_NUM_SCROLLBUTTONS] =
{
{
/* forward declaration for internal use */
static void DrawDrawingWindow();
+static void DrawLevelInfoWindow();
static void DrawPropertiesWindow();
static void CopyLevelToUndoBuffer(int);
static void HandleControlButtons(struct GadgetInfo *);
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;
static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
#endif
-/* pointer to score value */
-static int *gadget_score_value;
-static int *gadget_areas_value;
-
-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[] =
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 ||
gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_DESCRIPTION_TEXT, control_info[i].text,
+ GDI_INFO_TEXT, control_info[i].text,
GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
GDI_WIDTH, width,
gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_DESCRIPTION_TEXT, scrollbutton_info[i].text,
+ 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,
static void CreateCounterButtons()
{
- int i, j;
+ int i;
for (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
{
+ int j;
+ int xpos = SX + counterbutton_info[i].x; /* xpos of down count button */
+ int ypos = SY + counterbutton_info[i].y;
+
for (j=0; j<2; j++)
{
Pixmap gd_pixmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
- int id = counterbutton_info[i].gadget_id + j;
+ int id = (j == 0 ?
+ counterbutton_info[i].gadget_id_down :
+ counterbutton_info[i].gadget_id_up);
int gd_xoffset;
- int gd_x1, gd_x2, gd_y;
+ int gd_x, gd_x1, gd_x2, gd_y;
unsigned long event_mask;
+ char infotext[MAX_INFOTEXT_LEN + 1];
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+ sprintf(infotext, "%s counter value by 1, 5 or 10",
+ (j == 0 ? "decrease" : "increase"));
+
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_X, SX + counterbutton_info[i].x + gd_xoffset,
- GDI_Y, SY + counterbutton_info[i].y,
+ GDI_INFO_TEXT, infotext,
+ GDI_X, xpos,
+ GDI_Y, ypos,
GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
Error(ERR_EXIT, "cannot create gadget");
level_editor_gadget[id] = gi;
+ xpos += gi->width + ED_GADGET_DISTANCE; /* xpos of text count button */
+
+ if (j == 0)
+ {
+ id = counterbutton_info[i].gadget_id_text;
+ event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+ gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_INFO_TEXT, "enter counter value",
+ GDI_X, xpos,
+ GDI_Y, ypos,
+ GDI_TYPE, GD_TYPE_TEXTINPUT_NUMERIC,
+ GDI_NUMBER_VALUE, 0,
+ GDI_NUMBER_MIN, counterbutton_info[i].min_value,
+ GDI_NUMBER_MAX, counterbutton_info[i].max_value,
+ GDI_TEXT_SIZE, 3,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
+ GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleCounterButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ xpos += gi->width + ED_GADGET_DISTANCE; /* xpos of up count button */
+ }
}
}
}
level_editor_gadget[id] = gi;
/* ... up to eight areas for element content ... */
- for (i=0; i<MAX_ELEMCONT; i++)
+ for (i=0; i<MAX_ELEM_CONTENT; i++)
{
- int gx = SX + ED_AREA_ELEMCONT_XPOS + 5 * (i % 4) * MINI_TILEX;
- int gy = SX + ED_AREA_ELEMCONT_YPOS + 6 * (i / 4) * MINI_TILEY;
+ 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_ELEMCONT_0 + i;
+ id = ED_CTRL_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;
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_X, SX + ED_AREA_ELEMCONT_XPOS,
- GDI_Y, SY + ED_AREA_ELEMCONT_YPOS,
+ GDI_X, SX + ED_AREA_ELEM_CONTENT_XPOS,
+ GDI_Y, SY + ED_AREA_ELEM_CONTENT_YPOS,
GDI_WIDTH, MINI_TILEX,
GDI_HEIGHT, MINI_TILEY,
GDI_TYPE, GD_TYPE_DRAWING_AREA,
static void CreateTextInputGadgets()
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
- int gd_x, gd_y;
- struct GadgetInfo *gi;
- unsigned long event_mask;
- int id;
+ int i;
+
+ 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;
- gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
- event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+ event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
- /* text input gadget for the level name */
- id = ED_CTRL_ID_LEVEL_NAME;
- gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_X, SX + ED_COUNT_ELEMCONT_XPOS,
- GDI_Y, SY + ED_AREA_ELEMCONT_YPOS + 3 * TILEX,
- GDI_TYPE, GD_TYPE_TEXTINPUT,
- GDI_TEXT_VALUE, level.name,
- 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, 3,
- GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleTextInputGadgets,
- GDI_END);
+ gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
- if (gi == NULL)
- Error(ERR_EXIT, "cannot create gadget");
+ sprintf(infotext, "Enter %s", textinput_info[i].infotext);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
- level_editor_gadget[id] = gi;
+ 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");
+
+ level_editor_gadget[id] = gi;
+ }
}
static void CreateScrollbarGadgets()
if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
{
- items_max = lev_fieldx + 2;
+ items_max = MAX(lev_fieldx + 2, ED_FIELDX);
items_visible = ED_FIELDX;
item_position = 0;
}
else
{
- items_max = lev_fieldy + 2;
+ items_max = MAX(lev_fieldy + 2, ED_FIELDY);
items_visible = ED_FIELDY;
item_position = 0;
}
gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_DESCRIPTION_TEXT, scrollbar_info[i].text,
+ GDI_INFO_TEXT, scrollbar_info[i].text,
GDI_X, SX + scrollbar_info[i].x,
GDI_Y, SY + scrollbar_info[i].y,
GDI_WIDTH, scrollbar_info[i].width,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
- GDI_DESIGN_BORDER, 3,
+ GDI_DESIGN_BORDER, ED_BORDER_SIZE,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
static void MapCounterButtons(int id)
{
- int i;
-
- for (i=0; i<2; i++)
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id + i]);
+ 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()
{
int i, x, y, graphic;
- level_xpos = -1;
- level_ypos = -1;
edit_mode = ED_MODE_DRAWING;
name_typing = FALSE;
}
else
{
+ level_xpos = -1;
+ level_ypos = -1;
undo_buffer_position = -1;
undo_buffer_steps = -1;
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
void AdjustEditorScrollbar(int id)
{
struct GadgetInfo *gi = level_editor_gadget[id];
- struct GadgetScrollbar *gs = &gi->scrollbar;
- int items_max, items_visible, item_position = gs->item_position;
+ int items_max, items_visible, item_position;
if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
{
- items_max = lev_fieldx + 2;
+ items_max = MAX(lev_fieldx + 2, ED_FIELDX);
items_visible = ED_FIELDX;
+ item_position = level_xpos + 1;
}
else
{
- items_max = lev_fieldy + 2;
+ items_max = MAX(lev_fieldy + 2, ED_FIELDY);
items_visible = ED_FIELDY;
+ item_position = level_ypos + 1;
}
if (item_position > items_max - items_visible)
AdjustScrollbar(gi, items_max, item_position);
}
+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);
+}
+
+void ModifyEditorCounter(int counter_id, int new_value)
+{
+ int *counter_value = *counterbutton_info[counter_id].counter_value;
+ int gadget_id = counterbutton_info[counter_id].gadget_id_text;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+
+ ModifyTextInputNumberValue(gi, new_value);
+
+ if (counter_value != NULL)
+ *counter_value = gi->text.number_value;
+}
+
static void PickDrawingElement(int button, int element)
{
if (button < 1 || button > 3)
void LevelEd(int mx, int my, int button)
{
static int last_button = 0;
+
+ /*
static int in_field_pressed = FALSE;
+ */
+
static boolean use_floodfill = FALSE;
}
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);
XFlush(display);
}
-
-
-#if 0
-
switch(CheckCtrlButtons(mx,my,button))
{
case ED_BUTTON_EDIT:
break;
}
-#endif
-
-
-
if (mx>=ED_COUNT_GADGET_XPOS &&
mx<ED_COUNT_GADGET_XPOS+31*FONT2_XSIZE+10 &&
my>=ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE &&
}
else if (!motion_status) /* Mauszeiger nicht im Cruncher-Feld */
in_field_pressed = FALSE;
+
+#endif
+
+
+
}
}
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;
MapMainDrawingArea();
}
+static void DrawLevelInfoWindow()
+{
+ char infotext[1024];
+ int infotext_yoffset = MINI_TILEX + ED_GADGET_DISTANCE;
+ int i, x, y;
+
+ ClearWindow();
+ UnmapLevelEditorWindowGadgets();
+
+ DrawTextF(ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS, FC_YELLOW,
+ "Level Information");
+
+ gadget_level_xsize_value = &lev_fieldx;
+ gadget_level_ysize_value = &lev_fieldy;
+ gadget_level_random_value = &random_placement_num_objects;
+ gadget_level_collect_value = &level.edelsteine;
+ gadget_level_timelimit_value = &level.time;
+ gadget_level_timescore_value = &level.score[10];
+
+ /* draw counter gadgets for level info */
+ for (i=ED_COUNTER_ID_LEVEL_XSIZE; i<=ED_COUNTER_ID_LEVEL_TIMESCORE; i++)
+ {
+ x = counterbutton_info[i].x;
+ y = counterbutton_info[i].y - infotext_yoffset;
+
+ sprintf(infotext, "%s:", counterbutton_info[i].infotext);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
+
+ DrawTextF(x, y, FC_YELLOW, infotext);
+ ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
+ MapCounterButtons(i);
+ }
+
+ /* 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()
{
int *num_areas = &MampferMax;
- int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX;
- int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY;
- int area_sx = SX + ED_AREA_ELEMCONT_XPOS;
- int area_sy = SY + ED_AREA_ELEMCONT_YPOS;
+ int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
+ int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
+ int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
+ int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
int i, x, y;
- for (i=0; i<MAX_ELEMCONT; i++)
+ for (i=0; i<MAX_ELEM_CONTENT; i++)
for (y=0; y<3; y++)
for (x=0; x<3; x++)
ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
- for (i=0; i<MAX_ELEMCONT; i++)
- UnmapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
+ for (i=0; i<MAX_ELEM_CONTENT; i++)
+ UnmapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
/* display counter to choose number of element content areas */
- gadget_areas_value = num_areas;
- DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
- x = counterbutton_info[ED_COUNTER_ELEMCONT].x + DXSIZE;
- y = counterbutton_info[ED_COUNTER_ELEMCONT].y;
+ gadget_elem_content_value = num_areas;
+ DrawCounterValueField(ED_COUNTER_ID_ELEM_CONTENT,*gadget_elem_content_value);
+ x = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].x + counter_xsize;
+ y = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].y;
DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
FC_YELLOW, "number of content areas");
- MapCounterButtons(ED_COUNTER_ELEMCONT);
+ ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, *gadget_elem_content_value);
+ MapCounterButtons(ED_COUNTER_ID_ELEM_CONTENT);
/* delete content areas in case of reducing number of them */
XFillRectangle(display, backbuffer, gc,
}
for (i=0; i<*num_areas; i++)
- MapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
+ MapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
}
static void DrawAmoebaContentArea()
{
- int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX;
- int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY;
- int area_sx = SX + ED_AREA_ELEMCONT_XPOS;
- int area_sy = SY + ED_AREA_ELEMCONT_YPOS;
+ int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
+ int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
+ int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
+ int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
int x, y;
ElementContent[0][0][0] = level.amoebe_inhalt;
{
if (elements_with_counter[i].element == properties_element)
{
- int x = counterbutton_info[ED_COUNTER_SCORE].x + DXSIZE;
- int y = counterbutton_info[ED_COUNTER_SCORE].y;
+ int x = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].x + counter_xsize;
+ int y = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].y;
+
+ gadget_elem_score_value = elements_with_counter[i].counter_value;
+
+ /*
+ DrawCounterValueField(ED_COUNTER_ID_SCORE, *gadget_score_value);
+ */
- gadget_score_value = elements_with_counter[i].counter_value;
- DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
FC_YELLOW, elements_with_counter[i].text);
- MapCounterButtons(ED_COUNTER_SCORE);
+ ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, *gadget_elem_score_value);
+ MapCounterButtons(ED_COUNTER_ID_ELEM_SCORE);
break;
}
}
else
DrawElementContentAreas();
}
-
- /* TEST ONLY: level name text input gadget */
- MapTextInputGadget(ED_CTRL_ID_LEVEL_NAME);
}
static void swap_numbers(int *i1, int *i2)
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;
if (mode != CB_DELETE_OLD_CURSOR && delete_old_brush)
CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
- if (!IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos))
+ if (!IN_ED_FIELD(cursor_x, cursor_y) ||
+ !IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos))
{
delete_old_brush = FALSE;
return;
mode == CB_BRUSH_TO_CURSOR || button == 1 ?
brush_buffer[x][y] : new_element);
- if (IN_LEV_FIELD(lx, ly) &&
- sx >=0 && sx < ED_FIELDX && sy >=0 && sy < ED_FIELDY)
+ if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
{
if (sx < border_from_x)
border_from_x = sx;
button == 2 ? new_element2 :
button == 3 ? new_element3 : 0);
+
+#if 0
+ if (button_release_event)
+ button = 0;
+#endif
+
+
if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
return;
if (draw_level)
{
if (button_release_event)
+ {
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+ if (edit_mode == ED_MODE_DRAWING && draw_with_brush &&
+ !inside_drawing_area)
+ DeleteBrushFromCursor();
+ }
+
if (!button)
break;
if (draw_with_brush)
- CopyBrushToLevel(sx, sy, button);
+ {
+ if (!button_release_event)
+ CopyBrushToLevel(sx, sy, button);
+ }
else if (new_element != Feld[lx][ly])
{
if (new_element == EL_SPIELFIGUR)
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;
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)
switch (id)
{
- case ED_CTRL_ID_SCORE_DOWN:
- case ED_CTRL_ID_SCORE_UP:
- *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step);
- if (*gadget_score_value < 0)
- *gadget_score_value = 0;
- else if (*gadget_score_value > 255)
- *gadget_score_value = 255;
+ case 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_ELEM_SCORE_TEXT:
+ *gadget_elem_score_value = gi->text.number_value;
+ break;
- DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+ 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_ELEM_CONTENT_TEXT:
+ *gadget_elem_content_value = gi->text.number_value;
+ DrawElementContentAreas();
break;
- case ED_CTRL_ID_ELEMCONT_DOWN:
- case ED_CTRL_ID_ELEMCONT_UP:
- *gadget_areas_value += (id == ED_CTRL_ID_ELEMCONT_DOWN ? -step : step);
- if (*gadget_areas_value < 1)
- *gadget_areas_value = 1;
- else if (*gadget_areas_value > MAX_ELEMCONT)
- *gadget_areas_value = MAX_ELEMCONT;
+ case 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;
- DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
- DrawElementContentAreas();
+ 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;
+ }
+}
+
+static void HandleTextInputGadgets(struct GadgetInfo *gi)
+{
+ int id = gi->custom_id;
+
+ switch (id)
+ {
+ case ED_CTRL_ID_LEVEL_NAME:
+ strcpy(level.name, gi->text.value);
+ break;
+
+ case ED_CTRL_ID_LEVEL_AUTHOR:
+ strcpy(level.author, gi->text.value);
break;
default:
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_INFO:
if (edit_mode != ED_MODE_INFO)
{
- DrawControlWindow();
+ DrawLevelInfoWindow();
edit_mode = ED_MODE_INFO;
}
else
}
}
-static void HandleTextInputGadgets(struct GadgetInfo *gi)
-{
- int id = gi->custom_id;
-
- switch (id)
- {
- case ED_CTRL_ID_LEVEL_NAME:
- strcpy(level.name, gi->text.value);
- break;
-
- default:
- break;
- }
-}
-
-/* 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,
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)
if (key)
{
sprintf(shortcut, " ('%s%c')",
- (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
+ (key >= 'A' && key <= 'Z' ? "Shift-" :
+ gi->custom_id == ED_CTRL_ID_SINGLE_ITEMS ? ".' or '" : ""),
+ key);
if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
strcat(infotext, shortcut);
if (id == ED_CTRL_ID_DRAWING_LEVEL)
{
- if (IN_LEV_FIELD(lx, ly))
+ if (button_status)
{
- if (gi->state == GD_BUTTON_PRESSED)
+ int min_sx = 0, min_sy = 0;
+ int max_sx = gi->drawing.area_xsize - 1;
+ int max_sy = gi->drawing.area_ysize - 1;
+ int min_lx = 0, min_ly = 0;
+ int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
+
+ /* make sure to stay inside drawing area boundaries */
+ sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx);
+ sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy);
+
+ /* get positions inside level field */
+ lx = sx + level_xpos;
+ ly = sy + level_ypos;
+
+ /* make sure to stay inside level field boundaries */
+ lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx);
+ ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly);
+
+ /* correct drawing area positions accordingly */
+ sx = lx - level_xpos;
+ sy = ly - level_ypos;
+ }
+
+ if (IN_ED_FIELD(sx,sy) && IN_LEV_FIELD(lx, ly))
+ {
+ if (button_status) /* if (gi->state == GD_BUTTON_PRESSED) */
{
if (gi->event.type == GD_EVENT_PRESSED)
{
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)
- CopyBrushToCursor(sx, sy);
+ if (edit_mode == ED_MODE_DRAWING && draw_with_brush && !button_status)
+ {
+ if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
+ CopyBrushToCursor(sx, sy);
+ else
+ DeleteBrushFromCursor();
+ }
}
else if (id == ED_CTRL_ID_AMOEBA_CONTENT)
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_ELEMCONT_0 + 1,
- sx, sy);
+ "Cruncher %d content: %d, %d",
+ id - ED_CTRL_ID_ELEM_CONTENT_0 + 1, sx, sy);
}