#define RANDOM_USE_PERCENTAGE 0
#define RANDOM_USE_NUM_OBJECTS 1
+/* values for elements with content */
+#define MAX_ELEMCONT 8
+
/* values for the control window */
-#define ED_CTRL_BUTTONS_GFX_YPOS 236
+#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_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 other gadgets */
-#define ED_SCORE_XPOS TILEX
-#define ED_SCORE_YPOS (7 * TILEY)
+/* values for counter gadgets */
#define ED_COUNT_VALUE_XOFFSET 5
#define ED_COUNT_VALUE_YOFFSET 3
+#define ED_COUNT_SCORE_XPOS (TILEX)
+#define ED_COUNT_SCORE_YPOS (14 * MINI_TILEY)
+#define ED_COUNT_ELEMCONT_XPOS (TILEX)
+#define ED_COUNT_ELEMCONT_YPOS (17 * MINI_TILEY)
+
+/* values for element content drawing areas */
+#define ED_AREA_ELEMCONT_XPOS (TILEX)
+#define ED_AREA_ELEMCONT_YPOS (10 * TILEY)
/* control button identifiers */
#define ED_CTRL_ID_SINGLE_ITEMS 0
#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_BRUSH 13
#define ED_CTRL_ID_WRAP_DOWN 14
+#define ED_CTRL_ID_UNUSED2 15
#define ED_CTRL_ID_UNDO 16
#define ED_CTRL_ID_INFO 17
#define ED_CTRL_ID_SAVE 18
/* 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
/* drawing area identifiers */
-#define ED_CTRL_ID_DRAWING_LEVEL 24
+#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_NUM_GADGETS 25
+#define ED_NUM_GADGETS 36
/* values for counter gadgets */
#define ED_COUNTER_SCORE 0
+#define ED_COUNTER_ELEMCONT 1
-#define ED_NUM_COUNTERS 1
+#define ED_NUM_COUNTERS 2
static struct
{
int gadget_id;
} counter_info[ED_NUM_COUNTERS] =
{
- { ED_SCORE_XPOS, ED_SCORE_YPOS, ED_CTRL_ID_SCORE_DOWN }
+ { 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 }
};
/* forward declaration for internal use */
static void DrawDrawingWindow();
-static void DrawPropertiesWindow(int);
+static void DrawPropertiesWindow();
static void CopyLevelToUndoBuffer();
static void HandleDrawingAreas(struct GadgetInfo *);
static void HandleCounterButtons(struct GadgetInfo *);
static boolean level_editor_gadgets_created = FALSE;
static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static int properties_element = 0;
+static short ElementContent[MAX_ELEMCONT][3][3];
static short OrigBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static int undo_buffer_position = 0;
/* pointer to score value */
static int *gadget_score_value;
+static int *gadget_areas_value;
static int level_xpos,level_ypos;
static int edit_mode;
Pixmap gd_pixmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
int gd_xoffset, gd_yoffset;
- int gd_x1, gd_x2, gd_y;
+ int gd_x1, gd_x2, gd_y1, gd_y2;
int width, height;
+ int button_type;
+ int radio_button_nr;
+ boolean radio_button_pressed;
unsigned long event_mask;
int id = i;
- if (i < ED_NUM_CTRL1_BUTTONS)
+ 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_BRUSH)
+ {
+ button_type = GD_TYPE_RADIO_BUTTON;
+ radio_button_nr = 1;
+ radio_button_pressed = (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;
+
+ 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)
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+ else
+ event_mask = GD_EVENT_RELEASED;
+ }
+
+ if (id < ED_NUM_CTRL1_BUTTONS)
{
int x = i % ED_CTRL1_BUTTONS_HORIZ;
int y = i / ED_CTRL1_BUTTONS_HORIZ;
gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset;
gd_x2 = DOOR_GFX_PAGEX7 + gd_xoffset;
- gd_y = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset;
-
- if (i == ED_CTRL_ID_WRAP_LEFT ||
- i == ED_CTRL_ID_WRAP_RIGHT ||
- i == ED_CTRL_ID_WRAP_UP ||
- i == ED_CTRL_ID_WRAP_DOWN)
- event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- else
- event_mask = GD_EVENT_RELEASED;
+ gd_y1 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset;
+ gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
GDI_WIDTH, width,
GDI_HEIGHT, height,
- GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+ GDI_TYPE, button_type,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+ GDI_RADIO_NR, radio_button_nr,
+ GDI_RADIO_PRESSED, radio_button_pressed,
+ 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,
+ GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK, HandleControlButtons,
GDI_END);
}
}
-static void CreateCounterButtons(int counter_id)
+static void CreateCounterButtons()
{
- int i;
+ int i, j;
- for (i=0; i<2; i++)
+ for (i=0; i<ED_NUM_COUNTERS; i++)
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
- struct GadgetInfo *gi;
- int gd_xoffset;
- int gd_x1, gd_x2, gd_y;
- int id = counter_info[counter_id].gadget_id + i;
- unsigned long event_mask;
-
- event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
-
- gd_xoffset = (i == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
- gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
- gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
- gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
-
- gi = CreateGadget(GDI_CUSTOM_ID, id,
- GDI_X, SX + counter_info[counter_id].x + gd_xoffset,
- GDI_Y, SY + counter_info[counter_id].y,
- GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
- GDI_HEIGHT, ED_BUTTON_COUNT_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_EVENT_MASK, event_mask,
- GDI_CALLBACK, HandleCounterButtons,
- GDI_END);
+ for (j=0; j<2; j++)
+ {
+ Pixmap gd_pixmap = pix[PIX_DOOR];
+ struct GadgetInfo *gi;
+ int gd_xoffset;
+ int gd_x1, gd_x2, gd_y;
+ int id = counter_info[i].gadget_id + j;
+ unsigned long event_mask;
- if (gi == NULL)
- Error(ERR_EXIT, "cannot create gadget");
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- level_editor_gadget[id] = gi;
+ gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
+ gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
+ gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
+ gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_X, SX + counter_info[i].x + gd_xoffset,
+ GDI_Y, SY + counter_info[i].y,
+ GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
+ GDI_HEIGHT, ED_BUTTON_COUNT_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_EVENT_MASK, event_mask,
+ GDI_CALLBACK, HandleCounterButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
}
}
{
struct GadgetInfo *gi;
unsigned long event_mask;
+ int id;
+ int i;
event_mask =
GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
GD_EVENT_OFF_BORDERS;
- gi = CreateGadget(GDI_CUSTOM_ID, ED_CTRL_ID_DRAWING_LEVEL,
+ /* one for the level drawing area ... */
+ id = ED_CTRL_ID_DRAWING_LEVEL;
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX,
GDI_Y, SY,
GDI_WIDTH, SXSIZE,
if (gi == NULL)
Error(ERR_EXIT, "cannot create gadget");
- level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL] = gi;
+ level_editor_gadget[id] = gi;
+
+ /* ... up to eight areas for element content ... */
+ for (i=0; i<MAX_ELEMCONT; 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;
+
+ id = ED_CTRL_ID_ELEMCONT_0 + i;
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_X, gx,
+ GDI_Y, gy,
+ GDI_WIDTH, 3 * MINI_TILEX,
+ GDI_HEIGHT, 3 * MINI_TILEY,
+ GDI_TYPE, GD_TYPE_DRAWING_AREA,
+ GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK, HandleDrawingAreas,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+
+ /* ... 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_WIDTH, MINI_TILEX,
+ GDI_HEIGHT, MINI_TILEY,
+ GDI_TYPE, GD_TYPE_DRAWING_AREA,
+ GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK, HandleDrawingAreas,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
}
static void CreateLevelEditorGadgets()
return;
CreateControlButtons();
- CreateCounterButtons(ED_COUNTER_SCORE);
+ CreateCounterButtons();
CreateDrawingAreas();
level_editor_gadgets_created = TRUE;
MapGadget(level_editor_gadget[i]);
}
-static void MapCounterButtons(int counter_id)
+static void MapCounterButtons(int id)
{
int i;
for (i=0; i<2; i++)
- MapGadget(level_editor_gadget[counter_info[counter_id].gadget_id + i]);
+ MapGadget(level_editor_gadget[counter_info[id].gadget_id + i]);
+}
+
+static void MapDrawingArea(int id)
+{
+ MapGadget(level_editor_gadget[id]);
}
static void MapMainDrawingArea()
{
- MapGadget(level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL]);
+ MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+}
+
+static void UnmapDrawingArea(int id)
+{
+ UnmapGadget(level_editor_gadget[id]);
}
void UnmapLevelEditorWindowGadgets()
el2gfx(new_element3));
redraw_mask |= REDRAW_DOOR_1;
+ /*
+ properties_element = new_element;
if (edit_mode == ED_MODE_PROPERTIES)
- DrawPropertiesWindow(new_element);
+ DrawPropertiesWindow();
+ */
+
}
if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/
DrawMiniLevel(level_xpos, level_ypos);
}
-static void DrawPropertiesWindow(int element)
+static void DrawElementContentAreas()
+{
+ static int num_areas = MAX_ELEMCONT;
+ 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 i, x, y;
+
+ for (i=0; i<MAX_ELEMCONT; i++)
+ for (y=0; y<3; y++)
+ for (x=0; x<3; x++)
+ ElementContent[i][x][y] =
+ (i < 4 ? level.mampfer_inhalt[i][x][y] : EL_LEERRAUM);
+
+ for (i=0; i<MAX_ELEMCONT; i++)
+ UnmapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
+
+ /* display counter to choose number of element content areas */
+ gadget_areas_value = &num_areas;
+ DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+ x = counter_info[ED_COUNTER_ELEMCONT].x + DXSIZE;
+ y = counter_info[ED_COUNTER_ELEMCONT].y;
+ DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+ FC_YELLOW, "number of content areas");
+ MapCounterButtons(ED_COUNTER_ELEMCONT);
+
+ /* delete content areas in case of reducing number of them */
+ XFillRectangle(display, backbuffer, gc,
+ SX, area_sy - MINI_TILEX,
+ SXSIZE, 12 * MINI_TILEY);
+
+ /* draw some decorative border for the objects */
+ for (i=0; i<num_areas; i++)
+ {
+ for (y=0; y<4; y++)
+ for (x=0; x<4; x++)
+ DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
+ EL_ERDREICH);
+
+ XFillRectangle(display, drawto, gc,
+ area_sx + 5 * (i % 4) * MINI_TILEX + MINI_TILEX/2 - 1,
+ area_sy + 6 * (i / 4) * MINI_TILEY + MINI_TILEY/2 - 1,
+ 3 * MINI_TILEX + 2, 3 * MINI_TILEY + 2);
+ }
+
+ /* copy border to the right location */
+ XCopyArea(display, drawto, drawto, gc,
+ area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 12 * MINI_TILEY,
+ area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+
+ for (i=0; i<num_areas; i++)
+ {
+ for (y=0; y<3; y++)
+ for (x=0; x<3; x++)
+ DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
+ ElementContent[i][x][y]);
+
+ DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
+ area_sy - SY + 6 * (i / 4) * MINI_TILEY + 4 * MINI_TILEY - 4,
+ FC_YELLOW, "%d", i + 1);
+ }
+
+ for (i=0; i<num_areas; i++)
+ MapDrawingArea(ED_CTRL_ID_ELEMCONT_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 x, y;
+
+ ElementContent[0][0][0] = level.amoebe_inhalt;
+
+ /* draw decorative border for the object */
+ for (y=0; y<2; y++)
+ for (x=0; x<2; x++)
+ DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
+
+ XFillRectangle(display, drawto, gc,
+ area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
+ MINI_TILEX + 2, MINI_TILEY + 2);
+
+ /* copy border to the right location */
+ XCopyArea(display, drawto, drawto, gc,
+ area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
+ area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+
+ DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
+
+ MapDrawingArea(ED_CTRL_ID_AMOEBA_CONTENT);
+}
+
+static void DrawPropertiesWindow()
{
int i, x, y;
int num_elements_in_level;
ClearWindow();
UnmapLevelEditorWindowGadgets();
- DrawGraphic(1, 1, el2gfx(element));
+ /* draw some decorative border for the object */
+ for (y=0; y<3; y++)
+ for (x=0; x<3; x++)
+ DrawMiniElement(2 + x , 2 + y, EL_ERDREICH);
+
+ XFillRectangle(display, drawto, gc,
+ SX + TILEX + MINI_TILEX/2 - 1,
+ SY + TILEY + MINI_TILEY/2 - 1,
+ TILEX + 2, TILEY + 2);
+
+ /* copy border to the right location */
+ XCopyArea(display, drawto, drawto, gc,
+ SX + TILEX, SY + TILEY,
+ 2 * TILEX, 2 * TILEY,
+ SX + TILEX - MINI_TILEX/2, SY + TILEY - MINI_TILEY/2);
+
+ DrawGraphic(1, 1, el2gfx(properties_element));
DrawText(SX + 3*TILEX, SY + 5*TILEY/4, "Element Properties",
FS_SMALL, FC_YELLOW);
num_elements_in_level = 0;
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == element)
+ for (y=0; y<lev_fieldy; y++)
+ for (x=0; x<lev_fieldx; x++)
+ if (Feld[x][y] == properties_element)
num_elements_in_level++;
DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
num_elements_in_level);
+ /* check if there are elements where a score can be chosen for */
for (i=0; elements_with_counter[i].element != -1; i++)
{
- if (elements_with_counter[i].element == element)
+ if (elements_with_counter[i].element == properties_element)
{
- int x = SX + counter_info[ED_COUNTER_SCORE].x + DXSIZE;
- int y = SY + counter_info[ED_COUNTER_SCORE].y;
+ int x = counter_info[ED_COUNTER_SCORE].x + DXSIZE;
+ int y = counter_info[ED_COUNTER_SCORE].y;
gadget_score_value = elements_with_counter[i].counter_value;
DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
- DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
- elements_with_counter[i].text, FS_SMALL, FC_YELLOW);
+ DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+ FC_YELLOW, elements_with_counter[i].text);
MapCounterButtons(ED_COUNTER_SCORE);
break;
}
}
+
+ if (properties_element == EL_MAMPFER)
+ DrawElementContentAreas();
+ else if (IS_AMOEBOID(properties_element))
+ DrawAmoebaContentArea();
}
static void swap_numbers(int *i1, int *i2)
DrawLine(from_x, y, to_x, y, element, change_level);
}
+static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
+{
+ int from_sx, from_sy;
+ int to_sx, to_sy;
+
+ if (from_x > to_x)
+ swap_numbers(&from_x, &to_x);
+
+ if (from_y > to_y)
+ swap_numbers(&from_y, &to_y);
+
+ from_sx = SX + from_x * MINI_TILEX;
+ from_sy = SY + from_y * MINI_TILEY;
+ to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1;
+ to_sy = SY + to_y * MINI_TILEY + MINI_TILEY - 1;
+
+ XSetForeground(display, gc, WhitePixel(display, screen));
+
+ XDrawLine(display, drawto, gc, from_sx, from_sy, to_sx, from_sy);
+ XDrawLine(display, drawto, gc, to_sx, from_sy, to_sx, to_sy);
+ XDrawLine(display, drawto, gc, to_sx, to_sy, from_sx, to_sy);
+ XDrawLine(display, drawto, gc, from_sx, to_sy, from_sx, from_sy);
+
+ XSetForeground(display, gc, BlackPixel(display, screen));
+
+ if (from_x == to_x && from_y == to_y)
+ MarkTileDirty(from_x/2, from_y/2);
+ else
+ redraw_mask |= REDRAW_FIELD;
+}
+
+static void SelectArea(int from_x, int from_y, int to_x, int to_y,
+ int element, boolean change_level)
+{
+ if (element == -1 || change_level)
+ DrawRectangle(from_x, from_y, to_x, to_y, -1, FALSE);
+ else
+ DrawAreaBorder(from_x, from_y, to_x, to_y);
+}
+
+/* values for CopyBrushExt() */
+#define CB_AREA_TO_BRUSH 0
+#define CB_BRUSH_TO_LEVEL 1
+
+static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, int mode)
+{
+ static short brush_buffer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ static brush_from_x, brush_from_y;
+ static brush_to_x, brush_to_y;
+ int x, y;
+
+ if (from_x > to_x)
+ swap_numbers(&from_x, &to_x);
+
+ if (from_y > to_y)
+ swap_numbers(&from_y, &to_y);
+
+ if (mode == CB_AREA_TO_BRUSH)
+ {
+ for (y=from_y; y<=to_y; y++)
+ for (x=from_x; x<=to_x; x++)
+ brush_buffer[x][y] = Feld[x][y];
+
+ brush_from_x = from_x;
+ brush_from_y = from_y;
+ brush_to_x = to_x;
+ brush_to_y = to_y;
+ }
+ else
+ {
+ for (y=brush_from_y; y<=brush_to_y; y++)
+ for (x=brush_from_x; x<=brush_to_x; x++)
+ Feld[x][y] = brush_buffer[x][y];
+ CopyLevelToUndoBuffer();
+ }
+}
+
+static void CopyAreaToBrush(int from_x, int from_y, int to_x, int to_y)
+{
+ CopyBrushExt(from_x, from_y, to_x, to_y, CB_AREA_TO_BRUSH);
+}
+
+#if 0
+static void CopyBrushToLevel()
+{
+ CopyBrushExt(0, 0, 0, 0, CB_BRUSH_TO_LEVEL);
+}
+#endif
+
static void FloodFill(int from_x, int from_y, int fill_element)
{
int i,x,y;
safety--;
}
-static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
-{
- unsigned long border_color = ReadPixel(pix[PIX_SMALLFONT], 2, 16);
- int from_sx = SX + from_x * MINI_TILEX;
- int from_sy = SY + from_y * MINI_TILEX;
- int to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1;
- int to_sy = SY + to_y * MINI_TILEX + MINI_TILEY - 1;
-
- XSetForeground(display, gc, border_color);
-
- XDrawLine(display, drawto, gc, from_sx, from_sy, to_sx, from_sy);
- XDrawLine(display, drawto, gc, to_sx, from_sy, to_sx, to_sy);
- XDrawLine(display, drawto, gc, to_sx, to_sy, from_sx, to_sy);
- XDrawLine(display, drawto, gc, from_sx, to_sy, from_sx, from_sy);
-
- XSetForeground(display, gc, BlackPixel(display,screen));
-
- if (from_x == to_x && from_y == to_y)
- MarkTileDirty(from_x/2, from_y/2);
- else
- redraw_mask |= REDRAW_FIELD;
-}
-
-/* values for DrawLeveltext() modes */
+/* values for DrawLevelText() modes */
#define TEXT_INIT 0
#define TEXT_SETCURSOR 1
#define TEXT_WRITECHAR 2
}
DrawMiniLevel(level_xpos, level_ypos);
+ CopyLevelToUndoBuffer();
}
static void HandleDrawingAreas(struct GadgetInfo *gi)
{
static boolean started_inside_drawing_area = FALSE;
+ static boolean draw_with_brush = FALSE;
boolean inside_drawing_area = !gi->event.off_borders;
boolean button_press_event;
boolean button_release_event;
+ boolean draw_level = (gi->custom_id == ED_CTRL_ID_DRAWING_LEVEL);
int new_element;
int button = gi->event.button;
int sx = gi->event.x, sy = gi->event.y;
int lx, ly;
int x, y;
+ /*
if (edit_mode != ED_MODE_DRAWING)
return;
+ */
button_press_event = (gi->event.type == GD_EVENT_PRESSED);
button_release_event = (gi->event.type == GD_EVENT_RELEASED);
- sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
- sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
- lx = sx + level_xpos;
- ly = sy + level_ypos;
-
- lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx);
- ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly);
- sx = lx - level_xpos;
- sy = ly - level_ypos;
+ if (draw_level)
+ {
+ sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
+ sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
+ lx = sx + level_xpos;
+ ly = sy + level_ypos;
+
+ lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx);
+ ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly);
+ sx = lx - level_xpos;
+ sy = ly - level_ypos;
+ }
+ else
+ {
+ sx = (sx < 0 ? 0 : sx > 2 ? 2 : sx);
+ sy = (sy < 0 ? 0 : sy > 2 ? 2 : sy);
+ }
if (button_press_event)
started_inside_drawing_area = inside_drawing_area;
if (!started_inside_drawing_area)
return;
- if ((!button && !button_release_event) ||
- sx > lev_fieldx || sy > lev_fieldy ||
- (sx == 0 && level_xpos<0) ||
- (sx == 2*SCR_FIELDX - 1 && level_xpos > lev_fieldx - 2*SCR_FIELDX) ||
- (sy == 0 && level_ypos < 0) ||
- (sy == 2*SCR_FIELDY - 1 && level_ypos > lev_fieldy - 2*SCR_FIELDY))
+ if (!button && !button_release_event)
return;
new_element = (button == 1 ? new_element1 :
button == 2 ? new_element2 :
button == 3 ? new_element3 : 0);
+ if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
+ return;
+
switch (drawing_function)
{
case ED_CTRL_ID_SINGLE_ITEMS:
- if (button_release_event)
- CopyLevelToUndoBuffer();
+ if (draw_level)
+ {
+ if (button_release_event)
+ CopyLevelToUndoBuffer();
- if (!button)
- break;
+ if (!button)
+ break;
- if (new_element != Feld[lx][ly])
- {
- if (new_element == EL_SPIELFIGUR)
+ if (new_element != Feld[lx][ly])
{
- /* remove player at old position */
- for(y=0; y<lev_fieldy; y++)
+ if (new_element == EL_SPIELFIGUR)
{
- for(x=0; x<lev_fieldx; x++)
+ /* remove player at old position */
+ for(y=0; y<lev_fieldy; y++)
{
- if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+ for(x=0; x<lev_fieldx; x++)
{
- Feld[x][y] = EL_LEERRAUM;
- if (x - level_xpos >= 0 && x - level_xpos < 2*SCR_FIELDX &&
- y - level_ypos >= 0 && y - level_ypos < 2*SCR_FIELDY)
- DrawMiniElement(x - level_xpos, y - level_ypos, EL_LEERRAUM);
+ if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+ {
+ Feld[x][y] = EL_LEERRAUM;
+ if (x - level_xpos >= 0 && x - level_xpos < 2*SCR_FIELDX &&
+ y - level_ypos >= 0 && y - level_ypos < 2*SCR_FIELDY)
+ DrawMiniElement(x - level_xpos, y - level_ypos,
+ EL_LEERRAUM);
+ }
}
}
}
- }
- Feld[lx][ly] = new_element;
- DrawMiniElement(sx, sy, new_element);
+ Feld[lx][ly] = new_element;
+ DrawMiniElement(sx, sy, new_element);
+ }
+ }
+ else
+ {
+ DrawMiniGraphicExt(drawto, gc,
+ gi->x + sx * MINI_TILEX,
+ gi->y + sy * MINI_TILEY,
+ el2gfx(new_element));
+ DrawMiniGraphicExt(window, gc,
+ gi->x + sx * MINI_TILEX,
+ gi->y + sy * MINI_TILEY,
+ el2gfx(new_element));
}
break;
case ED_CTRL_ID_LINE:
case ED_CTRL_ID_RECTANGLE:
case ED_CTRL_ID_FILLED_BOX:
+ case ED_CTRL_ID_BRUSH:
{
static int last_sx = -1;
static int last_sy = -1;
draw_func = DrawLine;
else if (drawing_function == ED_CTRL_ID_RECTANGLE)
draw_func = DrawRectangle;
- else
+ else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
draw_func = DrawFilledBox;
+ else
+ draw_func = SelectArea;
if (button_press_event)
{
else if (button_release_event)
{
draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
- CopyLevelToUndoBuffer();
+ if (drawing_function == ED_CTRL_ID_BRUSH)
+ {
+ CopyAreaToBrush(start_sx, start_sy, sx, sy);
+ draw_with_brush = TRUE;
+ }
+ else
+ CopyLevelToUndoBuffer();
}
else if (last_sx != sx || last_sy != sy)
{
}
break;
+ case ED_CTRL_ID_TEXT:
+ if (button_press_event)
+ DrawLevelText(sx, sy, 0, TEXT_INIT);
+ break;
+
case ED_CTRL_ID_FLOOD_FILL:
if (button_press_event && Feld[lx][ly] != new_element)
{
}
break;
- case ED_CTRL_ID_TEXT:
- if (button_press_event)
- DrawLevelText(sx, sy, 0, TEXT_INIT);
- break;
-
default:
break;
}
DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
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;
+
+ DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+ DrawElementContentAreas();
+ break;
+
default:
break;
}
break;
case ED_CTRL_ID_PROPERTIES:
- DrawPropertiesWindow(new_element);
+ properties_element = new_element;
+ DrawPropertiesWindow();
edit_mode = ED_MODE_PROPERTIES;
break;
case ED_CTRL_ID_RANDOM_PLACEMENT:
RandomPlacement(button);
- CopyLevelToUndoBuffer();
break;
case ED_CTRL_ID_UNDO:
projects / rocksndiamonds.git / blobdiff