#include "buttons.h"
#include "files.h"
#include "game.h"
+#include "tape.h"
/* positions in the level editor */
#define ED_WIN_MB_LEFT_XPOS 7
/* values for properties window */
#define ED_PROPERTIES_XPOS (TILEX - MINI_TILEX/2)
+
/* values for counter gadgets */
#define ED_COUNT_VALUE_XOFFSET 5
#define ED_COUNT_VALUE_YOFFSET 3
#define ED_AREA_ELEMCONT_XPOS (TILEX)
#define ED_AREA_ELEMCONT_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_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
+
/* control button identifiers */
#define ED_CTRL_ID_SINGLE_ITEMS 0
#define ED_CTRL_ID_CONNECTED_ITEMS 1
#define ED_CTRL_ID_ELEMCONT_7 34
#define ED_CTRL_ID_AMOEBA_CONTENT 35
-#define ED_NUM_GADGETS 36
+/* text input identifiers */
+#define ED_CTRL_ID_LEVEL_NAME 36
+
+/* 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_NUM_GADGETS 43
/* values for counter gadgets */
#define ED_COUNTER_SCORE 0
#define ED_COUNTER_ELEMCONT 1
-#define ED_NUM_COUNTERS 2
+#define ED_NUM_COUNTERBUTTONS 2
+#define ED_NUM_SCROLLBUTTONS 4
+#define ED_NUM_SCROLLBARS 2
+
+/* values for CopyLevelToUndoBuffer() */
+#define UNDO_IMMEDIATE 0
+#define UNDO_ACCUMULATE 1
+
+static char *control_infotext[ED_NUM_CTRL_BUTTONS] =
+{
+ "draw single items",
+ "draw connected items",
+ "draw lines",
+ "enter text elements",
+ "draw outline rectangles",
+ "draw filled boxes",
+ "wrap (rotate) level up",
+ "properties of drawing element",
+ "flood fill",
+ "wrap (rotate) level left",
+ "",
+ "wrap (rotate) level right",
+ "random element placement",
+ "grab brush",
+ "wrap (rotate) level down",
+ "pick drawing element from editing area",
+ "undo last operation",
+ "level properties",
+ "save level",
+ "clear level",
+ "test level",
+ "exit level editor",
+};
static struct
{
int x, y;
int gadget_id;
-} counter_info[ED_NUM_COUNTERS] =
+} 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_SCORE_XPOS, ED_COUNT_SCORE_YPOS, ED_CTRL_ID_SCORE_DOWN },
+ { ED_COUNT_ELEMCONT_XPOS, ED_COUNT_ELEMCONT_YPOS, ED_CTRL_ID_ELEMCONT_DOWN }
};
+static struct
+{
+ int xpos, ypos;
+ int x, y;
+ int gadget_id;
+ char *text;
+} scrollbutton_info[ED_NUM_SCROLLBUTTONS] =
+{
+ {
+ ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE,
+ ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS, ED_CTRL_ID_SCROLL_UP,
+ "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,
+ "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,
+ "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,
+ "scroll level editing area right"
+ }
+};
+
+static struct
+{
+ int xpos, ypos;
+ int x, y;
+ int width, height;
+ int type;
+ int gadget_id;
+ char *text;
+} scrollbar_info[ED_NUM_SCROLLBARS] =
+{
+ {
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ 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,
+ "scroll level editing area vertically"
+ },
+ {
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ 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,
+ "scroll level editing area horizontally"
+ },
+};
+
+
/* forward declaration for internal use */
static void DrawDrawingWindow();
static void DrawPropertiesWindow();
-static void CopyLevelToUndoBuffer();
-static void HandleDrawingAreas(struct GadgetInfo *);
-static void HandleCounterButtons(struct GadgetInfo *);
+static void CopyLevelToUndoBuffer(int);
static void HandleControlButtons(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleDrawingAreaInfo(struct GadgetInfo *);
+static void HandleTextInputGadgets(struct GadgetInfo *);
static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
static boolean level_editor_gadgets_created = FALSE;
static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static boolean draw_with_brush = FALSE;
static int properties_element = 0;
static short ElementContent[MAX_ELEMCONT][3][3];
-static short OrigBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+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 undo_buffer_steps = 0;
static void ScrollMiniLevel(int from_x, int from_y, int scroll)
{
int x,y;
- int dx = (scroll==ED_SCROLL_LEFT ? -1 : scroll==ED_SCROLL_RIGHT ? 1 : 0);
- int dy = (scroll==ED_SCROLL_UP ? -1 : scroll==ED_SCROLL_DOWN ? 1 : 0);
+ int dx = (scroll == ED_SCROLL_LEFT ? -1 : scroll == ED_SCROLL_RIGHT ? 1 : 0);
+ int dy = (scroll == ED_SCROLL_UP ? -1 : scroll == ED_SCROLL_DOWN ? 1 : 0);
- XCopyArea(display,drawto,drawto,gc,
- SX+MINI_TILEX*(dx==-1),SY+MINI_TILEY*(dy==-1),
- SXSIZE-MINI_TILEX*ABS(dx),SYSIZE-MINI_TILEY*ABS(dy),
- SX+MINI_TILEX*(dx==+1),SY+MINI_TILEY*(dy==+1));
+ XCopyArea(display, drawto, drawto, gc,
+ SX + (dx == -1 ? MINI_TILEX : 0),
+ SY + (dy == -1 ? MINI_TILEY : 0),
+ (ED_FIELDX * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
+ (ED_FIELDY * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
+ SX + (dx == +1 ? MINI_TILEX : 0),
+ SY + (dy == +1 ? MINI_TILEY : 0));
if (dx)
{
- x = (dx==1 ? 0 : 2*SCR_FIELDX-1);
- for(y=0;y<2*SCR_FIELDY;y++)
- DrawMiniElementOrWall(x,y,from_x,from_y);
+ x = (dx == 1 ? 0 : ED_FIELDX - 1);
+ for(y=0; y<ED_FIELDY; y++)
+ DrawMiniElementOrWall(x, y, from_x, from_y);
}
else if (dy)
{
- y = (dy==1 ? 0 : 2*SCR_FIELDY-1);
- for(x=0;x<2*SCR_FIELDX;x++)
- DrawMiniElementOrWall(x,y,from_x,from_y);
+ y = (dy == 1 ? 0 : ED_FIELDY - 1);
+ for(x=0; x<ED_FIELDX; x++)
+ DrawMiniElementOrWall(x, y, from_x, from_y);
}
redraw_mask |= REDRAW_FIELD;
static void CreateControlButtons()
{
+ Pixmap gd_pixmap = pix[PIX_DOOR];
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
int i;
+ /* create toolbox buttons */
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
- struct GadgetInfo *gi;
+ int id = i;
+ int width, height;
int gd_xoffset, gd_yoffset;
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 (id == ED_CTRL_ID_SINGLE_ITEMS ||
id == ED_CTRL_ID_CONNECTED_ITEMS ||
gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_DESCRIPTION_TEXT, control_infotext[i],
GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
GDI_WIDTH, width,
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_CALLBACK_ACTION, HandleControlButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+
+ /* create buttons for scrolling of drawing area */
+ for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+ {
+ int id = scrollbutton_info[i].gadget_id;
+ int gd_x1, gd_x2, gd_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;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_DESCRIPTION_TEXT, scrollbutton_info[i].text,
+ 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_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_ACTION, HandleControlButtons,
GDI_END);
if (gi == NULL)
{
int i, j;
- for (i=0; i<ED_NUM_COUNTERS; i++)
+ for (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
{
for (j=0; j<2; j++)
{
Pixmap gd_pixmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
+ int id = counterbutton_info[i].gadget_id + j;
int gd_xoffset;
int gd_x1, gd_x2, gd_y;
- int id = counter_info[i].gadget_id + j;
unsigned long event_mask;
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
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_X, SX + counterbutton_info[i].x + gd_xoffset,
+ GDI_Y, SY + counterbutton_info[i].y,
GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
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_CALLBACK_ACTION, HandleCounterButtons,
GDI_END);
if (gi == NULL)
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX,
GDI_Y, SY,
- GDI_WIDTH, SXSIZE,
- GDI_HEIGHT, SYSIZE,
GDI_TYPE, GD_TYPE_DRAWING_AREA,
+ GDI_AREA_SIZE, ED_FIELDX, ED_FIELDY,
GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK, HandleDrawingAreas,
+ GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+ GDI_CALLBACK_ACTION, HandleDrawingAreas,
GDI_END);
if (gi == NULL)
GDI_TYPE, GD_TYPE_DRAWING_AREA,
GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK, HandleDrawingAreas,
+ GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+ GDI_CALLBACK_ACTION, HandleDrawingAreas,
GDI_END);
if (gi == NULL)
GDI_TYPE, GD_TYPE_DRAWING_AREA,
GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK, HandleDrawingAreas,
+ GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+ GDI_CALLBACK_ACTION, HandleDrawingAreas,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+}
+
+static void CreateTextInputGadgets()
+{
+ Pixmap gd_pixmap = pix[PIX_DOOR];
+ int gd_x, gd_y;
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
+ int id;
+
+ 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;
+
+ /* 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);
if (gi == NULL)
level_editor_gadget[id] = gi;
}
+static void CreateScrollbarGadgets()
+{
+ int i;
+
+ for (i=0; i<ED_NUM_SCROLLBARS; i++)
+ {
+ int id = scrollbar_info[i].gadget_id;
+ Pixmap gd_pixmap = pix[PIX_DOOR];
+ int gd_x1, gd_x2, gd_y1, gd_y2;
+ struct GadgetInfo *gi;
+ int items_max, items_visible, item_position;
+ unsigned long event_mask;
+
+ if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+ {
+ items_max = lev_fieldx + 2;
+ items_visible = ED_FIELDX;
+ item_position = 0;
+ }
+ else
+ {
+ items_max = lev_fieldy + 2;
+ items_visible = ED_FIELDY;
+ item_position = 0;
+ }
+
+ event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].xpos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
+ gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_DESCRIPTION_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_HEIGHT, scrollbar_info[i].height,
+ GDI_TYPE, scrollbar_info[i].type,
+ GDI_SCROLLBAR_ITEMS_MAX, items_max,
+ GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+ GDI_SCROLLBAR_ITEM_POSITION, item_position,
+ 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_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+}
+
static void CreateLevelEditorGadgets()
{
if (level_editor_gadgets_created)
CreateControlButtons();
CreateCounterButtons();
CreateDrawingAreas();
+ CreateTextInputGadgets();
+ CreateScrollbarGadgets();
level_editor_gadgets_created = TRUE;
}
int i;
for (i=0; i<2; i++)
- MapGadget(level_editor_gadget[counter_info[id].gadget_id + i]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id + i]);
}
static void MapDrawingArea(int id)
MapGadget(level_editor_gadget[id]);
}
+static void MapTextInputGadget(int id)
+{
+ MapGadget(level_editor_gadget[id]);
+}
+
static void MapMainDrawingArea()
{
+ int i;
+
+ for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+ MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
+
+ for (i=0; i<ED_NUM_SCROLLBARS; i++)
+ MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
+
MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
}
{
int i, x, y, graphic;
- level_xpos=-1;
- level_ypos=-1;
+ level_xpos = -1;
+ level_ypos = -1;
edit_mode = ED_MODE_DRAWING;
name_typing = FALSE;
CloseDoor(DOOR_CLOSE_ALL);
+ OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
+
if (level_editor_test_game)
{
for(x=0; x<lev_fieldx; x++)
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
- Ur[x][y] = OrigBackup[x][y];
+ Ur[x][y] = FieldBackup[x][y];
level_editor_test_game = FALSE;
}
{
undo_buffer_position = -1;
undo_buffer_steps = -1;
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
- DrawMiniLevel(level_xpos,level_ypos);
+ /*
+ DrawMiniLevel(level_xpos, level_ypos);
FadeToFront();
+ */
XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
CreateLevelEditorGadgets();
MapControlButtons();
+
+ /*
MapMainDrawingArea();
+ */
+
+ DrawDrawingWindow();
+ FadeToFront();
/*
OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
{
if (level_xpos < -1)
level_xpos = -1;
- if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
- level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
- if (lev_fieldx < 2*SCR_FIELDX - 2)
+ if (level_xpos > lev_fieldx - ED_FIELDX + 1)
+ level_xpos = lev_fieldx - ED_FIELDX + 1;
+ if (lev_fieldx < ED_FIELDX - 2)
level_xpos = -1;
if (level_ypos < -1)
level_ypos = -1;
- if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
- level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
- if (lev_fieldy < 2*SCR_FIELDY - 2)
+ if (level_ypos > lev_fieldy - ED_FIELDY + 1)
+ level_ypos = lev_fieldy - ED_FIELDY + 1;
+ if (lev_fieldy < ED_FIELDY - 2)
level_ypos = -1;
}
+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;
+
+ if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
+ {
+ items_max = lev_fieldx + 2;
+ items_visible = ED_FIELDX;
+ }
+ else
+ {
+ items_max = lev_fieldy + 2;
+ items_visible = ED_FIELDY;
+ }
+
+ if (item_position > items_max - items_visible)
+ item_position = items_max - items_visible;
+
+ AdjustScrollbar(gi, items_max, item_position);
+}
+
static void PickDrawingElement(int button, int element)
{
if (button < 1 || button > 3)
if (x>lev_fieldx || y>lev_fieldy ||
(x==0 && level_xpos<0) ||
- (x==2*SCR_FIELDX-1 && level_xpos>lev_fieldx-2*SCR_FIELDX) ||
+ (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
(y==0 && level_ypos<0) ||
- (y==2*SCR_FIELDY-1 && level_ypos>lev_fieldy-2*SCR_FIELDY))
+ (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY))
return;
from_x = x+level_xpos;
{
if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
break;
- if (lev_fieldx<2*SCR_FIELDX-2)
+ if (lev_fieldx<ED_FIELDX-2)
break;
level_xpos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
}
break;
case ED_BUTTON_RIGHT:
- if (level_xpos<=lev_fieldx-2*SCR_FIELDX)
+ if (level_xpos<=lev_fieldx-ED_FIELDX)
{
if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
break;
- if (lev_fieldx<2*SCR_FIELDX-2)
+ if (lev_fieldx<ED_FIELDX-2)
break;
level_xpos += (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
- if (level_xpos>lev_fieldx-2*SCR_FIELDX+1)
- level_xpos = lev_fieldx-2*SCR_FIELDX+1;
+ if (level_xpos>lev_fieldx-ED_FIELDX+1)
+ level_xpos = lev_fieldx-ED_FIELDX+1;
if (button==1)
ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_LEFT);
else
{
if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
break;
- if (lev_fieldy<2*SCR_FIELDY-2)
+ if (lev_fieldy<ED_FIELDY-2)
break;
level_ypos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
}
break;
case ED_BUTTON_DOWN:
- if (level_ypos<=lev_fieldy-2*SCR_FIELDY)
+ if (level_ypos<=lev_fieldy-ED_FIELDY)
{
if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
break;
- if (lev_fieldy<2*SCR_FIELDY-2)
+ if (lev_fieldy<ED_FIELDY-2)
break;
level_ypos += (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
- if (level_ypos>lev_fieldy-2*SCR_FIELDY+1)
- level_ypos = lev_fieldy-2*SCR_FIELDY+1;
+ if (level_ypos>lev_fieldy-ED_FIELDY+1)
+ level_ypos = lev_fieldy-ED_FIELDY+1;
if (button==1)
ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_UP);
else
if (!button || !in_field_pressed || button<1 || button>3 ||
(y==0 && level_ypos<0) ||
- (y==2*SCR_FIELDY-1 && level_ypos>lev_fieldy-2*SCR_FIELDY) ||
+ (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY) ||
(x==0 && level_xpos<0) ||
- (x==2*SCR_FIELDX-1 && level_xpos>lev_fieldx-2*SCR_FIELDX) ||
+ (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
x>lev_fieldx || y>lev_fieldy)
return;
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)
+ if (x-level_xpos>=0 && x-level_xpos<ED_FIELDX &&
+ y-level_ypos>=0 && y-level_ypos<ED_FIELDY)
DrawMiniElement(x-level_xpos,y-level_ypos,EL_LEERRAUM);
}
}
for(y=0;y<lev_fieldy;y++)
for(x=0;x<lev_fieldx;x++)
- if (Feld[x][y]==EL_SPIELFIGUR || Feld[x][y]==EL_SPIELER1)
+ if (Feld[x][y] == EL_SPIELFIGUR ||
+ Feld[x][y] == EL_SPIELER1 ||
+ Feld[x][y] == EL_SP_MURPHY)
figur_vorhanden = TRUE;
if (!figur_vorhanden)
static void DrawCounterValueField(int counter_id, int value)
{
- int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS;
- int y = SY + counter_info[counter_id].y;
+ int x = SX + counterbutton_info[counter_id].x + ED_WIN_COUNT_XPOS;
+ int y = SY + counterbutton_info[counter_id].y;
XCopyArea(display, pix[PIX_DOOR], drawto, gc,
DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
{
ClearWindow();
UnmapLevelEditorWindowGadgets();
- MapMainDrawingArea();
AdjustLevelScrollPosition();
+ AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_HORIZONTAL);
+ AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_VERTICAL);
DrawMiniLevel(level_xpos, level_ypos);
+ MapMainDrawingArea();
}
static void DrawElementContentAreas()
/* 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;
+ x = counterbutton_info[ED_COUNTER_ELEMCONT].x + DXSIZE;
+ y = counterbutton_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);
{
if (elements_with_counter[i].element == properties_element)
{
- int x = counter_info[ED_COUNTER_SCORE].x + DXSIZE;
- int y = counter_info[ED_COUNTER_SCORE].y;
+ int x = counterbutton_info[ED_COUNTER_SCORE].x + DXSIZE;
+ int y = counterbutton_info[ED_COUNTER_SCORE].y;
gadget_score_value = elements_with_counter[i].counter_value;
DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
else
DrawElementContentAreas();
}
+
+ /* TEST ONLY: level name text input gadget */
+ MapTextInputGadget(ED_CTRL_ID_LEVEL_NAME);
}
static void swap_numbers(int *i1, int *i2)
/* values for CopyBrushExt() */
#define CB_AREA_TO_BRUSH 0
-#define CB_BRUSH_TO_LEVEL 1
+#define CB_BRUSH_TO_CURSOR 1
+#define CB_BRUSH_TO_LEVEL 2
+#define CB_DELETE_OLD_CURSOR 3
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;
+ static short brush_buffer[ED_FIELDX][ED_FIELDY];
+ static int brush_width, brush_height;
+ static int last_cursor_x = -1, last_cursor_y = -1;
+ static boolean delete_old_brush;
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_DELETE_OLD_CURSOR && !delete_old_brush)
+ return;
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];
+ int from_lx, from_ly;
- brush_from_x = from_x;
- brush_from_y = from_y;
- brush_to_x = to_x;
- brush_to_y = to_y;
+ if (from_x > to_x)
+ swap_numbers(&from_x, &to_x);
+
+ if (from_y > to_y)
+ swap_numbers(&from_y, &to_y);
+
+ brush_width = to_x - from_x + 1;
+ brush_height = to_y - from_y + 1;
+
+ from_lx = from_x + level_xpos;
+ from_ly = from_y + level_ypos;
+
+ for (y=0; y<brush_height; y++)
+ for (x=0; x<brush_width; x++)
+ brush_buffer[x][y] = Feld[from_lx + x][from_ly + y];
+
+ delete_old_brush = FALSE;
}
- else
+ else if (mode == CB_BRUSH_TO_CURSOR || mode == CB_DELETE_OLD_CURSOR ||
+ mode == CB_BRUSH_TO_LEVEL)
{
- 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();
+ int cursor_x = (mode == CB_DELETE_OLD_CURSOR ? last_cursor_x : from_x);
+ int cursor_y = (mode == CB_DELETE_OLD_CURSOR ? last_cursor_y : from_y);
+ int cursor_from_x = cursor_x - brush_width / 2;
+ int cursor_from_y = cursor_y - brush_height / 2;
+ int border_from_x = cursor_x, border_from_y = cursor_y;
+ int border_to_x = cursor_x, border_to_y = cursor_y;
+
+ if (mode != CB_DELETE_OLD_CURSOR && delete_old_brush)
+ CopyBrushExt(0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
+
+ if (!IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos))
+ {
+ delete_old_brush = FALSE;
+ return;
+ }
+
+ for (y=0; y<brush_height; y++)
+ {
+ for (x=0; x<brush_width; x++)
+ {
+ int sx = cursor_from_x + x;
+ int sy = cursor_from_y + y;
+ int lx = sx + level_xpos;
+ int ly = sy + level_ypos;
+ int element = (mode == CB_DELETE_OLD_CURSOR ? -1 : brush_buffer[x][y]);
+ boolean change_level = (mode == CB_BRUSH_TO_LEVEL);
+
+ if (IN_LEV_FIELD(lx, ly) &&
+ sx >=0 && sx < ED_FIELDX && sy >=0 && sy < ED_FIELDY)
+ {
+ if (sx < border_from_x)
+ border_from_x = sx;
+ else if (sx > border_to_x)
+ border_to_x = sx;
+ if (sy < border_from_y)
+ border_from_y = sy;
+ else if (sy > border_to_y)
+ border_to_y = sy;
+
+ DrawLineElement(sx, sy, element, change_level);
+ }
+ }
+ }
+
+ /*
+ printf("%d, %d - %d, %d in level and screen\n",
+ border_from_x, border_from_y, border_to_x, border_to_y);
+ */
+
+ if (mode != CB_DELETE_OLD_CURSOR)
+ DrawAreaBorder(border_from_x, border_from_y, border_to_x, border_to_y);
+
+ if (mode == CB_BRUSH_TO_LEVEL)
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+
+ last_cursor_x = cursor_x;
+ last_cursor_y = cursor_y;
+ delete_old_brush = TRUE;
}
}
CopyBrushExt(from_x, from_y, to_x, to_y, CB_AREA_TO_BRUSH);
}
-#if 0
-static void CopyBrushToLevel()
+static void CopyBrushToLevel(int x, int y)
{
- CopyBrushExt(0, 0, 0, 0, CB_BRUSH_TO_LEVEL);
+ CopyBrushExt(x, y, 0, 0, CB_BRUSH_TO_LEVEL);
+}
+
+static void CopyBrushToCursor(int x, int y)
+{
+ CopyBrushExt(x, y, 0, 0, CB_BRUSH_TO_CURSOR);
+}
+
+static void DeleteBrushFromCursor()
+{
+ CopyBrushExt(0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
}
-#endif
static void FloodFill(int from_x, int from_y, int fill_element)
{
int letter_element = EL_CHAR_ASCII0 + letter;
int lx, ly;
+ /* map lower case letters to upper case and convert special characters */
+ if (letter >= 'a' && letter <= 'z')
+ letter_element = EL_CHAR_ASCII0 + letter + (int)('A' - 'a');
+ else if (letter == 'ä' || letter == 'Ä')
+ letter_element = EL_CHAR_AE;
+ else if (letter == 'ö' || letter == 'Ö')
+ letter_element = EL_CHAR_OE;
+ else if (letter == 'ü' || letter == 'Ü')
+ letter_element = EL_CHAR_UE;
+ else if (letter == '^')
+ letter_element = EL_CHAR_COPY;
+ else
+ letter_element = EL_CHAR_ASCII0 + letter;
+
if (mode != TEXT_INIT)
{
if (!typing)
delete_buffer[sx - start_sx] = Feld[lx][ly];
Feld[lx][ly] = letter_element;
- if (sx + 1 < 2*SCR_FIELDX && lx + 1 < lev_fieldx)
+ if (sx + 1 < ED_FIELDX && lx + 1 < lev_fieldx)
DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR);
- else if (sy + 1 < 2*SCR_FIELDY && ly + 1 < lev_fieldy)
+ else if (sy + 1 < ED_FIELDY && ly + 1 < lev_fieldy)
DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
else
DrawLevelText(0, 0, 0, TEXT_END);
break;
case TEXT_NEWLINE:
- if (sy + 1 < 2*SCR_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
+ if (sy + 1 < ED_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
else
DrawLevelText(0, 0, 0, TEXT_END);
break;
case TEXT_END:
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
DrawMiniElement(sx, sy, Feld[lx][ly]);
typing = FALSE;
break;
}
}
-static void CopyLevelToUndoBuffer()
+static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy,
+ int element, boolean change_level)
+{
+ int lx = sx + level_xpos;
+ int ly = sy + level_ypos;
+
+ if (element == -1)
+ DrawMiniElement(sx, sy, Feld[lx][ly]);
+ else
+ DrawAreaBorder(sx, sy, sx, sy);
+}
+
+static void CopyLevelToUndoBuffer(int mode)
{
+ static boolean accumulated_undo = FALSE;
+ boolean new_undo_buffer_position = TRUE;
int x, y;
- undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
+ switch (mode)
+ {
+ case UNDO_IMMEDIATE:
+ accumulated_undo = FALSE;
+ break;
+
+ case UNDO_ACCUMULATE:
+ if (accumulated_undo)
+ new_undo_buffer_position = FALSE;
+ accumulated_undo = TRUE;
+ break;
+
+ default:
+ break;
+ }
+
+ if (new_undo_buffer_position)
+ {
+ /* new position in undo buffer ring */
+ undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
- if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
- undo_buffer_steps++;
+ if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
+ undo_buffer_steps++;
+ }
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+#if 0
+#ifdef DEBUG
+ printf("level saved to undo buffer\n");
+#endif
+#endif
}
static void RandomPlacement(int button)
}
DrawMiniLevel(level_xpos, level_ypos);
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
+
+void WrapLevel(int dx, int dy)
+{
+ int wrap_dx = lev_fieldx - dx;
+ int wrap_dy = lev_fieldy - dy;
+ int x, y;
+
+ for(x=0; x<lev_fieldx; x++)
+ for(y=0; y<lev_fieldy; y++)
+ FieldBackup[x][y] = Feld[x][y];
+
+ for(x=0; x<lev_fieldx; x++)
+ for(y=0; y<lev_fieldy; y++)
+ Feld[x][y] =
+ FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
+
+ DrawMiniLevel(level_xpos, level_ypos);
+ CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
}
static void HandleDrawingAreas(struct GadgetInfo *gi)
{
static boolean started_inside_drawing_area = FALSE;
- static boolean draw_with_brush = FALSE;
int id = gi->custom_id;
boolean inside_drawing_area = !gi->event.off_borders;
boolean button_press_event;
int new_element;
int button = gi->event.button;
int sx = gi->event.x, sy = gi->event.y;
+ int min_sx = 0, min_sy = 0;
+ int max_sx = gi->drawing.area_xsize - 1, max_sy = gi->drawing.area_ysize - 1;
int lx, ly;
+ int min_lx = 0, min_ly = 0;
+ int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
int x, y;
/*
button_press_event = (gi->event.type == GD_EVENT_PRESSED);
button_release_event = (gi->event.type == GD_EVENT_RELEASED);
+ /* 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);
+
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);
+ /* get positions inside level field */
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);
+ /* 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;
}
- 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 (draw_level)
{
if (button_release_event)
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
if (!button)
break;
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)
+ if (x - level_xpos >= 0 && x - level_xpos < ED_FIELDX &&
+ y - level_ypos >= 0 && y - level_ypos < ED_FIELDY)
DrawMiniElement(x - level_xpos, y - level_ypos,
EL_LEERRAUM);
}
static int last_sy = -1;
if (button_release_event)
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
if (button)
{
case ED_CTRL_ID_RECTANGLE:
case ED_CTRL_ID_FILLED_BOX:
case ED_CTRL_ID_BRUSH:
+ case ED_CTRL_ID_TEXT:
{
static int last_sx = -1;
static int last_sy = -1;
draw_func = DrawRectangle;
else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
draw_func = DrawFilledBox;
- else
+ else if (drawing_function == ED_CTRL_ID_BRUSH)
draw_func = SelectArea;
+ else /* (drawing_function == ED_CTRL_ID_TEXT) */
+ draw_func = SetTextCursor;
if (button_press_event)
{
draw_func(sx, sy, sx, sy, new_element, FALSE);
start_sx = last_sx = sx;
start_sy = last_sy = sy;
+
+ if (drawing_function == ED_CTRL_ID_TEXT)
+ DrawLevelText(0, 0, 0, TEXT_END);
}
else if (button_release_event)
{
CopyAreaToBrush(start_sx, start_sy, sx, sy);
draw_with_brush = TRUE;
}
+ else if (drawing_function == ED_CTRL_ID_TEXT)
+ DrawLevelText(sx, sy, 0, TEXT_INIT);
else
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
else if (last_sx != sx || last_sy != sy)
{
}
break;
+
+
+#if 0
case ED_CTRL_ID_TEXT:
+ /*
+ DrawMiniElement(last_sx, last_sy, Feld[lx][ly]);
+ DrawAreaBorder(sx, sy, sx, sy);
+ last_sx = sx;
+ last_sy = sy;
+ */
+
if (button_press_event)
DrawLevelText(sx, sy, 0, TEXT_INIT);
break;
+#endif
+
+
case ED_CTRL_ID_FLOOD_FILL:
if (button_press_event && Feld[lx][ly] != new_element)
{
FloodFill(lx, ly, new_element);
DrawMiniLevel(level_xpos, level_ypos);
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
break;
if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
DrawLevelText(0, 0, 0, TEXT_END);
- if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
+ if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES &&
+ edit_mode != ED_MODE_DRAWING)
{
DrawDrawingWindow();
edit_mode = ED_MODE_DRAWING;
switch (id)
{
- 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_BRUSH:
- case ED_CTRL_ID_PICK_ELEMENT:
- last_drawing_function = drawing_function;
- drawing_function = id;
- break;
-
- case ED_CTRL_ID_WRAP_LEFT:
+ case ED_CTRL_ID_SCROLL_LEFT:
if (level_xpos >= 0)
{
- if (lev_fieldx < 2*SCR_FIELDX - 2)
+ int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetScrollbar *gs = &gi->scrollbar;
+
+ if (lev_fieldx < ED_FIELDX - 2)
break;
level_xpos -= step;
- if (level_xpos <- 1)
+ if (level_xpos < -1)
level_xpos = -1;
if (button == 1)
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
else
DrawMiniLevel(level_xpos, level_ypos);
+
+ AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
}
break;
- case ED_CTRL_ID_WRAP_RIGHT:
- if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
+ case ED_CTRL_ID_SCROLL_RIGHT:
+ if (level_xpos <= lev_fieldx - ED_FIELDX)
{
- if (lev_fieldx < 2*SCR_FIELDX - 2)
+ int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetScrollbar *gs = &gi->scrollbar;
+
+ if (lev_fieldx < ED_FIELDX - 2)
break;
level_xpos += step;
- if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
- level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+ if (level_xpos > lev_fieldx - ED_FIELDX + 1)
+ level_xpos = lev_fieldx - ED_FIELDX + 1;
if (button == 1)
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
else
DrawMiniLevel(level_xpos, level_ypos);
+
+ AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
}
break;
- case ED_CTRL_ID_WRAP_UP:
+ case ED_CTRL_ID_SCROLL_UP:
if (level_ypos >= 0)
{
- if (lev_fieldy < 2*SCR_FIELDY - 2)
+ int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetScrollbar *gs = &gi->scrollbar;
+
+ if (lev_fieldy < ED_FIELDY - 2)
break;
level_ypos -= step;
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
else
DrawMiniLevel(level_xpos, level_ypos);
+
+ AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
}
break;
- case ED_CTRL_ID_WRAP_DOWN:
- if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
+ case ED_CTRL_ID_SCROLL_DOWN:
+ if (level_ypos <= lev_fieldy - ED_FIELDY)
{
- if (lev_fieldy < 2*SCR_FIELDY - 2)
+ int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetScrollbar *gs = &gi->scrollbar;
+
+ if (lev_fieldy < ED_FIELDY - 2)
break;
level_ypos += step;
- if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
- level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+ if (level_ypos > lev_fieldy - ED_FIELDY + 1)
+ level_ypos = lev_fieldy - ED_FIELDY + 1;
if (button == 1)
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
else
DrawMiniLevel(level_xpos, level_ypos);
+
+ AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
}
break;
- case ED_CTRL_ID_PROPERTIES:
- properties_element = new_element;
- DrawPropertiesWindow();
- edit_mode = ED_MODE_PROPERTIES;
+ case ED_CTRL_ID_SCROLL_HORIZONTAL:
+ level_xpos = gi->event.item_position - 1;
+ DrawMiniLevel(level_xpos, level_ypos);
+ break;
+
+ case ED_CTRL_ID_SCROLL_VERTICAL:
+ level_ypos = gi->event.item_position - 1;
+ DrawMiniLevel(level_xpos, level_ypos);
+ break;
+
+ case ED_CTRL_ID_WRAP_LEFT:
+ WrapLevel(-step, 0);
+ break;
+
+ case ED_CTRL_ID_WRAP_RIGHT:
+ WrapLevel(step, 0);
+ break;
+
+ case ED_CTRL_ID_WRAP_UP:
+ WrapLevel(0, -step);
+ break;
+
+ case ED_CTRL_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_BRUSH:
+ case ED_CTRL_ID_PICK_ELEMENT:
+ last_drawing_function = drawing_function;
+ drawing_function = id;
break;
case ED_CTRL_ID_RANDOM_PLACEMENT:
RandomPlacement(button);
break;
+ case ED_CTRL_ID_PROPERTIES:
+ if (edit_mode != ED_MODE_PROPERTIES)
+ {
+ properties_element = new_element;
+ DrawPropertiesWindow();
+ edit_mode = ED_MODE_PROPERTIES;
+ }
+ else
+ {
+ DrawDrawingWindow();
+ edit_mode = ED_MODE_DRAWING;
+ }
+ break;
+
case ED_CTRL_ID_UNDO:
if (undo_buffer_steps == 0)
{
for(x=0; x<MAX_LEV_FIELDX; x++)
for(y=0; y<MAX_LEV_FIELDY; y++)
Feld[x][y] = new_element3;
- CopyLevelToUndoBuffer();
+ CopyLevelToUndoBuffer(ED_CTRL_ID_CLEAR);
DrawMiniLevel(level_xpos, level_ypos);
break;
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+ if (Feld[x][y] == EL_SPIELFIGUR ||
+ Feld[x][y] == EL_SPIELER1 ||
+ Feld[x][y] == EL_SP_MURPHY)
player_present = TRUE;
if (!player_present)
case ED_CTRL_ID_TEST:
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+ if (Feld[x][y] == EL_SPIELFIGUR ||
+ Feld[x][y] == EL_SPIELER1 ||
+ Feld[x][y] == EL_SP_MURPHY)
player_present = TRUE;
if (!player_present)
{
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
- OrigBackup[x][y] = Ur[x][y];
+ FieldBackup[x][y] = Ur[x][y];
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
Ur[x][y] = Feld[x][y];
+ UnmapLevelEditorGadgets();
+
+ /* draw smaller door */
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX7, 64,
+ 108, 64,
+ EX - 4, EY - 12);
+ redraw_mask |= REDRAW_ALL;
+
+ CloseDoor(DOOR_CLOSE_ALL);
+
+ DrawCompleteVideoDisplay();
+
+ if (setup.autorecord)
+ TapeStartRecording();
+
level_editor_test_game = TRUE;
game_status = PLAYING;
+
InitGame();
}
break;
break;
default:
+#ifdef DEBUG
if (gi->event.type == GD_EVENT_PRESSED)
printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
else if (gi->event.type == GD_EVENT_RELEASED)
printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
else
printf("default: HandleControlButtons: ?\n");
+#endif
break;
}
}
{
if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
{
- char *keyname = getKeyNameFromKeySym(key);
- char letter = 0;
-
- if (strlen(keyname) == 1)
- letter = keyname[0];
- else if (strcmp(keyname, "space") == 0)
- letter = ' ';
- else if (strcmp(keyname, "less") == 0)
- letter = '<';
- else if (strcmp(keyname, "equal") == 0)
- letter = '=';
- else if (strcmp(keyname, "greater") == 0)
- letter = '>';
-
- /* map lower case letters to upper case */
- if (letter >= 'a' && letter <= 'z')
- letter += (int)('A' - 'a');
- else if (letter == 'ä')
- letter = 'Ä';
- else if (letter == 'ä')
- letter = 'Ö';
- else if (letter == 'ä')
- letter = 'Ü';
+ char letter = getCharFromKeySym(key);
if (letter)
DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
DrawLevelText(0, 0, 0, TEXT_NEWLINE);
}
}
+
+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,
+ INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
+ redraw_mask |= REDRAW_FIELD;
+}
+
+void HandleEditorGadgetInfoText(void *ptr)
+{
+ struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
+ char infotext[MAX_INFOTEXT_LEN + 1];
+
+ ClearEditorGadgetInfoText();
+
+ /* misuse this function to delete brush cursor, if needed */
+ if (edit_mode == ED_MODE_DRAWING && draw_with_brush)
+ DeleteBrushFromCursor();
+
+ if (gi == NULL || gi->description_text == NULL)
+ return;
+
+ strncpy(infotext, gi->description_text, MAX_INFOTEXT_LEN);
+ infotext[MAX_INFOTEXT_LEN] = '\0';
+
+ DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FS_SMALL, FC_YELLOW);
+}
+
+static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
+{
+ int id = gi->custom_id;
+ int sx = gi->event.x;
+ int sy = gi->event.y;
+ int lx = sx + level_xpos;
+ int ly = sy + level_ypos;
+
+ ClearEditorGadgetInfoText();
+
+ if (id == ED_CTRL_ID_DRAWING_LEVEL)
+ {
+ if (IN_LEV_FIELD(lx, ly))
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+ "Level: %d, %d (Screen: %d, %d)", lx, ly, sx, sy);
+
+ /* misuse this function to draw brush cursor, if needed */
+ if (edit_mode == ED_MODE_DRAWING && draw_with_brush)
+ CopyBrushToCursor(sx, sy);
+ }
+ 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);
+}
projects / rocksndiamonds.git / blobdiff