#define ED_CTRL2_BUTTON_XSIZE 30
#define ED_CTRL2_BUTTON_YSIZE 20
#define ED_CTRL2_BUTTONS_XPOS 5
-#define ED_CTRL2_BUTTONS_YPOS 100
+#define ED_CTRL2_BUTTONS_YPOS 99
#define ED_NUM_CTRL1_BUTTONS (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT)
#define ED_NUM_CTRL2_BUTTONS (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
#define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
+/* values for the element list */
+#define ED_ELEMENTLIST_UP_XPOS 35
+#define ED_ELEMENTLIST_UP_YPOS 5
+#define ED_ELEMENTLIST_UP_ALT_YPOS 140
+#define ED_ELEMENTLIST_DOWN_XPOS 35
+#define ED_ELEMENTLIST_DOWN_YPOS 250
+#define ED_ELEMENTLIST_DOWN_ALT_YPOS 165
+#define ED_ELEMENTLIST_UPDOWN_XSIZE 30
+#define ED_ELEMENTLIST_UPDOWN_YSIZE 25
+#define ED_ELEMENTLIST_XPOS 6
+#define ED_ELEMENTLIST_YPOS 30
+#define ED_ELEMENTLIST_ALT_YPOS 190
+#define ED_ELEMENTLIST_XSIZE 22
+#define ED_ELEMENTLIST_YSIZE 22
+#define ED_ELEMENTLIST_BUTTONS_HORIZ 4
+#define ED_ELEMENTLIST_BUTTONS_VERT 10
+#define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \
+ ED_ELEMENTLIST_BUTTONS_VERT)
+
/* values for element properties window */
#define ED_PROPERTIES_XPOS (TILEX - MINI_TILEX/2)
#define ED_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_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)
/* 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_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_TEXT 7
-#define ED_CTRL_ID_FLOOD_FILL 8
-#define ED_CTRL_ID_WRAP_LEFT 9
-#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_WRAP_DOWN 14
-#define ED_CTRL_ID_PICK_ELEMENT 15
-#define ED_CTRL_ID_UNDO 16
-#define ED_CTRL_ID_INFO 17
-#define ED_CTRL_ID_SAVE 18
-#define ED_CTRL_ID_CLEAR 19
-#define ED_CTRL_ID_TEST 20
-#define ED_CTRL_ID_EXIT 21
+#define GADGET_ID_NONE -1
+
+#define GADGET_ID_SINGLE_ITEMS 0
+#define GADGET_ID_CONNECTED_ITEMS 1
+#define GADGET_ID_LINE 2
+#define GADGET_ID_ARC 3
+#define GADGET_ID_RECTANGLE 4
+#define GADGET_ID_FILLED_BOX 5
+#define GADGET_ID_WRAP_UP 6
+#define GADGET_ID_TEXT 7
+#define GADGET_ID_FLOOD_FILL 8
+#define GADGET_ID_WRAP_LEFT 9
+#define GADGET_ID_PROPERTIES 10
+#define GADGET_ID_WRAP_RIGHT 11
+#define GADGET_ID_RANDOM_PLACEMENT 12
+#define GADGET_ID_GRAB_BRUSH 13
+#define GADGET_ID_WRAP_DOWN 14
+#define GADGET_ID_PICK_ELEMENT 15
+#define GADGET_ID_UNDO 16
+#define GADGET_ID_INFO 17
+#define GADGET_ID_SAVE 18
+#define GADGET_ID_CLEAR 19
+#define GADGET_ID_TEST 20
+#define GADGET_ID_EXIT 21
/* counter button identifiers */
-#define ED_CTRL_ID_ELEM_SCORE_DOWN 22
-#define ED_CTRL_ID_ELEM_SCORE_TEXT 23
-#define ED_CTRL_ID_ELEM_SCORE_UP 24
-#define ED_CTRL_ID_ELEM_CONTENT_DOWN 25
-#define ED_CTRL_ID_ELEM_CONTENT_TEXT 26
-#define ED_CTRL_ID_ELEM_CONTENT_UP 27
-#define ED_CTRL_ID_LEVEL_XSIZE_DOWN 28
-#define ED_CTRL_ID_LEVEL_XSIZE_TEXT 29
-#define ED_CTRL_ID_LEVEL_XSIZE_UP 30
-#define ED_CTRL_ID_LEVEL_YSIZE_DOWN 31
-#define ED_CTRL_ID_LEVEL_YSIZE_TEXT 32
-#define ED_CTRL_ID_LEVEL_YSIZE_UP 33
-#define ED_CTRL_ID_LEVEL_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
+#define GADGET_ID_ELEM_SCORE_DOWN 22
+#define GADGET_ID_ELEM_SCORE_TEXT 23
+#define GADGET_ID_ELEM_SCORE_UP 24
+#define GADGET_ID_ELEM_CONTENT_DOWN 25
+#define GADGET_ID_ELEM_CONTENT_TEXT 26
+#define GADGET_ID_ELEM_CONTENT_UP 27
+#define GADGET_ID_LEVEL_XSIZE_DOWN 28
+#define GADGET_ID_LEVEL_XSIZE_TEXT 29
+#define GADGET_ID_LEVEL_XSIZE_UP 30
+#define GADGET_ID_LEVEL_YSIZE_DOWN 31
+#define GADGET_ID_LEVEL_YSIZE_TEXT 32
+#define GADGET_ID_LEVEL_YSIZE_UP 33
+#define GADGET_ID_LEVEL_RANDOM_DOWN 34
+#define GADGET_ID_LEVEL_RANDOM_TEXT 35
+#define GADGET_ID_LEVEL_RANDOM_UP 36
+#define GADGET_ID_LEVEL_COLLECT_DOWN 37
+#define GADGET_ID_LEVEL_COLLECT_TEXT 38
+#define GADGET_ID_LEVEL_COLLECT_UP 39
+#define GADGET_ID_LEVEL_TIMELIMIT_DOWN 40
+#define GADGET_ID_LEVEL_TIMELIMIT_TEXT 41
+#define GADGET_ID_LEVEL_TIMELIMIT_UP 42
+#define GADGET_ID_LEVEL_TIMESCORE_DOWN 43
+#define GADGET_ID_LEVEL_TIMESCORE_TEXT 44
+#define GADGET_ID_LEVEL_TIMESCORE_UP 45
/* drawing area identifiers */
-#define ED_CTRL_ID_DRAWING_LEVEL 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
+#define GADGET_ID_DRAWING_LEVEL 46
+#define GADGET_ID_ELEM_CONTENT_0 47
+#define GADGET_ID_ELEM_CONTENT_1 48
+#define GADGET_ID_ELEM_CONTENT_2 49
+#define GADGET_ID_ELEM_CONTENT_3 50
+#define GADGET_ID_ELEM_CONTENT_4 51
+#define GADGET_ID_ELEM_CONTENT_5 52
+#define GADGET_ID_ELEM_CONTENT_6 53
+#define GADGET_ID_ELEM_CONTENT_7 54
+#define GADGET_ID_AMOEBA_CONTENT 55
/* text input identifiers */
-#define ED_CTRL_ID_LEVEL_NAME 56
-#define ED_CTRL_ID_LEVEL_AUTHOR 57
+#define GADGET_ID_LEVEL_NAME 56
+#define GADGET_ID_LEVEL_AUTHOR 57
/* gadgets for scrolling of drawing area */
-#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 GADGET_ID_SCROLL_UP 58
+#define GADGET_ID_SCROLL_DOWN 59
+#define GADGET_ID_SCROLL_LEFT 60
+#define GADGET_ID_SCROLL_RIGHT 61
+#define GADGET_ID_SCROLL_HORIZONTAL 62
+#define GADGET_ID_SCROLL_VERTICAL 63
-#define ED_NUM_GADGETS 64
+/* gadgets for scrolling element list */
+#define GADGET_ID_ELEMENTLIST_UP 64
+#define GADGET_ID_ELEMENTLIST_DOWN 65
+
+/* gadgets for buttons in element list */
+#define GADGET_ID_ELEMENTLIST_FIRST 66
+#define GADGET_ID_ELEMENTLIST_LAST 105
+
+#define NUM_EDITOR_GADGETS 106
/* values for counter gadgets */
#define ED_COUNTER_ID_ELEM_SCORE 0
#define ED_COUNTER_ID_LEVEL_TIMELIMIT 6
#define ED_COUNTER_ID_LEVEL_TIMESCORE 7
+#define ED_NUM_COUNTERBUTTONS 8
+
+/* values for scrollbutton gadgets */
+#define ED_SCROLLBUTTON_AREA_UP 0
+#define ED_SCROLLBUTTON_AREA_DOWN 1
+#define ED_SCROLLBUTTON_AREA_LEFT 2
+#define ED_SCROLLBUTTON_AREA_RIGHT 3
+#define ED_SCROLLBUTTON_LIST_UP 4
+#define ED_SCROLLBUTTON_LIST_DOWN 5
+
+#define ED_NUM_SCROLLBUTTONS 6
+
+/* values for scrollbar gadgets */
+#define ED_SCROLLBAR_HORIZONTAL 0
+#define ED_SCROLLBAR_VERTICAL 1
+
+#define ED_NUM_SCROLLBARS 2
+
/* 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() */
{
ED_COUNT_ELEM_SCORE_XPOS, ED_COUNT_ELEM_SCORE_YPOS,
MIN_SCORE, MAX_SCORE,
- ED_CTRL_ID_ELEM_SCORE_DOWN, ED_CTRL_ID_ELEM_SCORE_UP,
- ED_CTRL_ID_ELEM_SCORE_TEXT,
+ GADGET_ID_ELEM_SCORE_DOWN, GADGET_ID_ELEM_SCORE_UP,
+ GADGET_ID_ELEM_SCORE_TEXT,
&gadget_elem_score_value,
"element score"
},
{
ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS,
MIN_ELEM_CONTENT, MAX_ELEM_CONTENT,
- ED_CTRL_ID_ELEM_CONTENT_DOWN, ED_CTRL_ID_ELEM_CONTENT_UP,
- ED_CTRL_ID_ELEM_CONTENT_TEXT,
+ GADGET_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP,
+ GADGET_ID_ELEM_CONTENT_TEXT,
&gadget_elem_content_value,
"element content"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(0),
MIN_LEV_FIELDX, MAX_LEV_FIELDX,
- ED_CTRL_ID_LEVEL_XSIZE_DOWN, ED_CTRL_ID_LEVEL_XSIZE_UP,
- ED_CTRL_ID_LEVEL_XSIZE_TEXT,
+ GADGET_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP,
+ GADGET_ID_LEVEL_XSIZE_TEXT,
&gadget_level_xsize_value,
"playfield width"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(1),
MIN_LEV_FIELDY, MAX_LEV_FIELDY,
- ED_CTRL_ID_LEVEL_YSIZE_DOWN, ED_CTRL_ID_LEVEL_YSIZE_UP,
- ED_CTRL_ID_LEVEL_YSIZE_TEXT,
+ GADGET_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP,
+ GADGET_ID_LEVEL_YSIZE_TEXT,
&gadget_level_ysize_value,
"playfield height"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(2),
0, 100,
- ED_CTRL_ID_LEVEL_RANDOM_DOWN, ED_CTRL_ID_LEVEL_RANDOM_UP,
- ED_CTRL_ID_LEVEL_RANDOM_TEXT,
+ GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP,
+ GADGET_ID_LEVEL_RANDOM_TEXT,
&gadget_level_random_value,
"number of random elements"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(3),
0, 999,
- ED_CTRL_ID_LEVEL_COLLECT_DOWN, ED_CTRL_ID_LEVEL_COLLECT_UP,
- ED_CTRL_ID_LEVEL_COLLECT_TEXT,
+ GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP,
+ GADGET_ID_LEVEL_COLLECT_TEXT,
&gadget_level_collect_value,
"number of emeralds to collect"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(4),
0, 999,
- ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN, ED_CTRL_ID_LEVEL_TIMELIMIT_UP,
- ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT,
+ GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP,
+ GADGET_ID_LEVEL_TIMELIMIT_TEXT,
&gadget_level_timelimit_value,
"time available to solve level"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(5),
0, 255,
- ED_CTRL_ID_LEVEL_TIMESCORE_DOWN, ED_CTRL_ID_LEVEL_TIMESCORE_UP,
- ED_CTRL_ID_LEVEL_TIMESCORE_TEXT,
+ GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP,
+ GADGET_ID_LEVEL_TIMESCORE_TEXT,
&gadget_level_timescore_value,
"score for each 10 seconds left"
},
{
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(6),
- ED_CTRL_ID_LEVEL_NAME,
+ GADGET_ID_LEVEL_NAME,
level.name,
"Level Title"
},
{
ED_LEVELINFO_XPOS, ED_COUNTER_YPOS(7),
- ED_CTRL_ID_LEVEL_AUTHOR,
+ GADGET_ID_LEVEL_AUTHOR,
level.author,
"Level Author"
}
{
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS, ED_CTRL_ID_SCROLL_UP,
+ ED_SCROLL_UP_XPOS, ED_SCROLL_UP_YPOS,
+ GADGET_ID_SCROLL_UP,
"scroll level editing area up"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 1 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS, ED_CTRL_ID_SCROLL_DOWN,
+ ED_SCROLL_DOWN_XPOS, ED_SCROLL_DOWN_YPOS,
+ GADGET_ID_SCROLL_DOWN,
"scroll level editing area down"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 2 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS, ED_CTRL_ID_SCROLL_LEFT,
+ ED_SCROLL_LEFT_XPOS, ED_SCROLL_LEFT_YPOS,
+ GADGET_ID_SCROLL_LEFT,
"scroll level editing area left"
},
{
ED_SCROLLBUTTON_XPOS, ED_SCROLLBUTTON_YPOS + 3 * ED_SCROLLBUTTON_YSIZE,
- ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS, ED_CTRL_ID_SCROLL_RIGHT,
+ ED_SCROLL_RIGHT_XPOS, ED_SCROLL_RIGHT_YPOS,
+ GADGET_ID_SCROLL_RIGHT,
"scroll level editing area right"
+ },
+ {
+ ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
+ ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
+ GADGET_ID_ELEMENTLIST_UP,
+ "scroll element list up"
+ },
+ {
+ ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS,
+ ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS,
+ GADGET_ID_ELEMENTLIST_DOWN,
+ "scroll element list down"
}
};
int width, height;
int type;
int gadget_id;
- char *text;
+ char *infotext;
} scrollbar_info[ED_NUM_SCROLLBARS] =
{
- {
- ED_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,
+ GADGET_ID_SCROLL_HORIZONTAL,
"scroll level editing area horizontally"
},
+ {
+ 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,
+ GADGET_ID_SCROLL_VERTICAL,
+ "scroll level editing area vertically"
+ },
};
+/* maximal size of level editor drawing area */
+#define MAX_ED_FIELDX (2 * SCR_FIELDX)
+#define MAX_ED_FIELDY (2 * SCR_FIELDY - 1)
+
+/*
+#define ED_FIELDX (2 * SCR_FIELDX - 1)
+#define ED_FIELDY (2 * SCR_FIELDY - 2)
+*/
+
+/* actual size of level editor drawing area */
+static int ed_fieldx = MAX_ED_FIELDX - 1, ed_fieldy = MAX_ED_FIELDY - 1;
+
+/* actual position of level editor drawing area in level playfield */
+static int level_xpos = -1, level_ypos = -1;
+
+#define IN_ED_FIELD(x,y) ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldx)
+
/* forward declaration for internal use */
static void DrawDrawingWindow();
static void DrawLevelInfoWindow();
static void HandleDrawingAreaInfo(struct GadgetInfo *);
static void HandleTextInputGadgets(struct GadgetInfo *);
-static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
-static boolean level_editor_gadgets_created = FALSE;
+static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
-static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
-static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static int drawing_function = GADGET_ID_SINGLE_ITEMS;
+static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
static boolean draw_with_brush = FALSE;
static int properties_element = 0;
static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
#endif
-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;
EL_MAUER_Y,
EL_MAUER_XY,
+ EL_INVISIBLE_STEEL,
+ EL_UNSICHTBAR,
EL_SPEED_PILL,
EL_LEERRAUM,
- EL_LEERRAUM,
- EL_LEERRAUM,
EL_CHAR_A + ('S' - 'A'),
EL_CHAR_A + ('O' - 'A'),
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),
+ (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 : ED_FIELDX - 1);
- for(y=0; y<ED_FIELDY; 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 : ED_FIELDY - 1);
- for(x=0; x<ED_FIELDX; x++)
+ y = (dy == 1 ? 0 : ed_fieldy - 1);
+ for(x=0; x<ed_fieldx; x++)
DrawMiniElementOrWall(x, y, from_x, from_y);
}
BackToFront();
}
-void InitLevelEditorGadgets()
-{
- int i;
-
- for (i=0; i<ED_NUM_GADGETS; i++)
- level_editor_gadget[i] = NULL;
-}
-
static void CreateControlButtons()
{
Pixmap gd_pixmap = pix[PIX_DOOR];
int gd_x1, gd_x2, gd_y1, gd_y2;
int button_type;
int radio_button_nr;
- boolean radio_button_pressed;
-
- if (id == ED_CTRL_ID_SINGLE_ITEMS ||
- id == ED_CTRL_ID_CONNECTED_ITEMS ||
- id == ED_CTRL_ID_LINE ||
- id == ED_CTRL_ID_ARC ||
- id == ED_CTRL_ID_TEXT ||
- id == ED_CTRL_ID_RECTANGLE ||
- id == ED_CTRL_ID_FILLED_BOX ||
- id == ED_CTRL_ID_FLOOD_FILL ||
- id == ED_CTRL_ID_GRAB_BRUSH ||
- id == ED_CTRL_ID_PICK_ELEMENT)
+ boolean checked;
+
+ if (id == GADGET_ID_SINGLE_ITEMS ||
+ id == GADGET_ID_CONNECTED_ITEMS ||
+ id == GADGET_ID_LINE ||
+ id == GADGET_ID_ARC ||
+ id == GADGET_ID_TEXT ||
+ id == GADGET_ID_RECTANGLE ||
+ id == GADGET_ID_FILLED_BOX ||
+ id == GADGET_ID_FLOOD_FILL ||
+ id == GADGET_ID_GRAB_BRUSH ||
+ id == GADGET_ID_PICK_ELEMENT)
{
button_type = GD_TYPE_RADIO_BUTTON;
radio_button_nr = 1;
- radio_button_pressed = (id == drawing_function ? TRUE : FALSE);
+ checked = (id == drawing_function ? TRUE : FALSE);
event_mask = GD_EVENT_PRESSED;
}
else
{
button_type = GD_TYPE_NORMAL_BUTTON;
radio_button_nr = 0;
- radio_button_pressed = FALSE;
+ checked = FALSE;
- if (id == ED_CTRL_ID_WRAP_LEFT ||
- id == ED_CTRL_ID_WRAP_RIGHT ||
- id == ED_CTRL_ID_WRAP_UP ||
- id == ED_CTRL_ID_WRAP_DOWN)
+ if (id == GADGET_ID_WRAP_LEFT ||
+ id == GADGET_ID_WRAP_RIGHT ||
+ id == GADGET_ID_WRAP_UP ||
+ id == GADGET_ID_WRAP_DOWN)
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
else
event_mask = GD_EVENT_RELEASED;
GDI_TYPE, button_type,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_RADIO_NR, radio_button_nr,
- GDI_RADIO_PRESSED, radio_button_pressed,
+ GDI_CHECKED, checked,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1,
GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2,
level_editor_gadget[id] = gi;
}
- /* create buttons for scrolling of drawing area */
+ /* create buttons for scrolling of drawing area and element list */
for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
{
int id = scrollbutton_info[i].gadget_id;
- int gd_x1, gd_x2, gd_y;
+ int x, y, width, height;
+ int gd_x1, gd_x2, gd_y1, gd_y2;
+
+ x = scrollbutton_info[i].x;
+ y = scrollbutton_info[i].y;
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
- gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
- gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ if (id == GADGET_ID_ELEMENTLIST_UP ||
+ id == GADGET_ID_ELEMENTLIST_DOWN)
+ {
+ x += DX;
+ y += DY;
+ width = ED_ELEMENTLIST_UPDOWN_XSIZE;
+ height = ED_ELEMENTLIST_UPDOWN_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].y;
+ gd_x2 = gd_x1;
+ gd_y2 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ }
+ else
+ {
+ x += SX;
+ y += SY;
+ width = ED_SCROLLBUTTON_XSIZE;
+ height = ED_SCROLLBUTTON_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_y2 = gd_y1;
+ }
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
- GDI_X, SX + scrollbutton_info[i].x,
- GDI_Y, SY + scrollbutton_info[i].y,
- GDI_WIDTH, ED_SCROLLBUTTON_XSIZE,
- GDI_HEIGHT, ED_SCROLLBUTTON_YSIZE,
+ GDI_X, x,
+ GDI_Y, y,
+ GDI_WIDTH, width,
+ GDI_HEIGHT, height,
+ GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+ GDI_STATE, GD_BUTTON_UNPRESSED,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+
+ /* create buttons for element list */
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ {
+ Pixmap deco_pixmap;
+ int deco_x, deco_y, deco_xpos, deco_ypos;
+ int gd_xoffset, gd_yoffset;
+ int gd_x, gd_y1, gd_y2;
+ int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
+ int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
+ int id = GADGET_ID_ELEMENTLIST_FIRST + i;
+
+ event_mask = GD_EVENT_RELEASED;
+
+ gd_xoffset = ED_ELEMENTLIST_XPOS + x * ED_ELEMENTLIST_XSIZE;
+ gd_yoffset = ED_ELEMENTLIST_YPOS + y * ED_ELEMENTLIST_YSIZE;
+
+ gd_x = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+ gd_y1 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
+ gd_y2 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_ALT_YPOS;
+
+ getMiniGraphicSource(el2gfx(editor_element[i]),
+ &deco_pixmap, &deco_x, &deco_y);
+ deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
+ deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_INFO_TEXT, "choose element",
+ GDI_X, DX + gd_xoffset,
+ GDI_Y, DY + gd_yoffset,
+ GDI_WIDTH, ED_ELEMENTLIST_XSIZE,
+ GDI_HEIGHT, ED_ELEMENTLIST_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
+ GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
+ GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+ GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
+ GDI_DECORATION_SHIFTING, 1, 1,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
GD_EVENT_OFF_BORDERS;
/* one for the level drawing area ... */
- id = ED_CTRL_ID_DRAWING_LEVEL;
+ id = GADGET_ID_DRAWING_LEVEL;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX,
GDI_Y, SY,
GDI_TYPE, GD_TYPE_DRAWING_AREA,
- GDI_AREA_SIZE, ED_FIELDX, ED_FIELDY,
+ GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
- id = ED_CTRL_ID_ELEM_CONTENT_0 + i;
+ id = GADGET_ID_ELEM_CONTENT_0 + i;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, gx,
GDI_Y, gy,
}
/* ... and one for the amoeba content */
- id = ED_CTRL_ID_AMOEBA_CONTENT;
+ id = GADGET_ID_AMOEBA_CONTENT;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_X, SX + ED_AREA_ELEM_CONTENT_XPOS,
GDI_Y, SY + ED_AREA_ELEM_CONTENT_YPOS,
struct GadgetInfo *gi;
unsigned long event_mask;
char infotext[1024];
- int id = ED_CTRL_ID_LEVEL_NAME + i;
+ int id = GADGET_ID_LEVEL_NAME + i;
event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
{
- items_max = MAX(lev_fieldx + 2, ED_FIELDX);
- items_visible = ED_FIELDX;
+ items_max = MAX(lev_fieldx + 2, ed_fieldx);
+ items_visible = ed_fieldx;
item_position = 0;
}
else
{
- items_max = MAX(lev_fieldy + 2, ED_FIELDY);
- items_visible = ED_FIELDY;
+ 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_INFO_TEXT, scrollbar_info[i].text,
+ GDI_INFO_TEXT, scrollbar_info[i].infotext,
GDI_X, SX + scrollbar_info[i].x,
GDI_Y, SY + scrollbar_info[i].y,
GDI_WIDTH, scrollbar_info[i].width,
}
}
-static void CreateLevelEditorGadgets()
+void CreateLevelEditorGadgets()
{
- if (level_editor_gadgets_created)
- return;
-
CreateControlButtons();
CreateCounterButtons();
CreateDrawingAreas();
CreateTextInputGadgets();
CreateScrollbarGadgets();
-
- level_editor_gadgets_created = TRUE;
}
static void MapControlButtons()
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
MapGadget(level_editor_gadget[i]);
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
}
static void MapCounterButtons(int id)
static void MapMainDrawingArea()
{
+ boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx);
+ boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
int i;
for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+ {
+ if (((i == ED_SCROLLBUTTON_AREA_LEFT || i == ED_SCROLLBUTTON_AREA_RIGHT) &&
+ no_horizontal_scrollbar) ||
+ ((i == ED_SCROLLBUTTON_AREA_UP || i == ED_SCROLLBUTTON_AREA_DOWN) &&
+ no_vertical_scrollbar))
+ continue;
+
MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
+ }
for (i=0; i<ED_NUM_SCROLLBARS; i++)
+ {
+ if ((i == ED_SCROLLBAR_HORIZONTAL && no_horizontal_scrollbar) ||
+ (i == ED_SCROLLBAR_VERTICAL && no_vertical_scrollbar))
+ continue;
+
MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
+ }
- MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+ MapDrawingArea(GADGET_ID_DRAWING_LEVEL);
}
static void UnmapDrawingArea(int id)
{
int i;
- for (i=ED_NUM_CTRL_BUTTONS; i<ED_NUM_GADGETS; i++)
- UnmapGadget(level_editor_gadget[i]);
+ for (i=0; i<NUM_EDITOR_GADGETS; i++)
+ if (level_editor_gadget[i]->x < DX)
+ UnmapGadget(level_editor_gadget[i]);
}
void UnmapLevelEditorGadgets()
{
int i;
- for (i=0; i<ED_NUM_GADGETS; i++)
+ for (i=0; i<NUM_EDITOR_GADGETS; i++)
UnmapGadget(level_editor_gadget[i]);
}
int i, x, y, graphic;
edit_mode = ED_MODE_DRAWING;
- name_typing = FALSE;
CloseDoor(DOOR_CLOSE_ALL);
}
/*
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
FadeToFront();
*/
OpenDoor(DOOR_OPEN_1);
- if (!level_editor_gadgets_created)
- CreateLevelEditorGadgets();
- else
- strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name);
+ strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
MapControlButtons();
*/
}
-void DrawControlWindow()
+
+
+#if 0
+
+static void DrawControlWindow()
{
int i,x,y;
int2str(level.fieldy,3),FS_SMALL,FC_YELLOW);
}
-void AdjustLevelScrollPosition()
+#endif
+
+
+
+static void AdjustDrawingAreaGadgets()
+{
+ int ed_xsize = lev_fieldx + 2;
+ int ed_ysize = lev_fieldy + 2;
+ int max_ed_fieldx = MAX_ED_FIELDX;
+ int max_ed_fieldy = MAX_ED_FIELDY;
+ boolean horizontal_scrollbar_needed;
+ boolean vertical_scrollbar_needed;
+ int x, y, width, height;
+ int xoffset, yoffset;
+
+ /* check if we need any scrollbars */
+ horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
+ vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy);
+
+ /* check if we have a smaller editor field because of scrollbars */
+ if (horizontal_scrollbar_needed)
+ max_ed_fieldy = MAX_ED_FIELDY - 1;
+ if (vertical_scrollbar_needed)
+ max_ed_fieldx = MAX_ED_FIELDX - 1;
+
+ /* check again if we now need more scrollbars because of less space */
+ horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
+ vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy);
+
+ /* check if editor field gets even smaller after adding new scrollbars */
+ if (horizontal_scrollbar_needed)
+ max_ed_fieldy = MAX_ED_FIELDY - 1;
+ if (vertical_scrollbar_needed)
+ max_ed_fieldx = MAX_ED_FIELDX - 1;
+
+ ed_fieldx = (ed_xsize < MAX_ED_FIELDX ? ed_xsize : max_ed_fieldx);
+ ed_fieldy = (ed_ysize < MAX_ED_FIELDY ? ed_ysize : max_ed_fieldy);
+
+ ModifyGadget(level_editor_gadget[GADGET_ID_DRAWING_LEVEL],
+ GDI_WIDTH, ed_fieldx * MINI_TILEX,
+ GDI_HEIGHT, ed_fieldy * MINI_TILEY,
+ GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
+ GDI_END);
+
+ xoffset = (ed_fieldx == MAX_ED_FIELDX ? ED_SCROLLBUTTON_XSIZE : 0);
+ yoffset = (ed_fieldy == MAX_ED_FIELDY ? ED_SCROLLBUTTON_YSIZE : 0);
+
+ x = SX + scrollbutton_info[ED_SCROLLBUTTON_AREA_RIGHT].x + xoffset;
+ y = SX + scrollbutton_info[ED_SCROLLBUTTON_AREA_DOWN].y + yoffset;
+
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_RIGHT], GDI_X, x, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_DOWN], GDI_Y, y, GDI_END);
+
+ width = scrollbar_info[ED_SCROLLBAR_HORIZONTAL].width + xoffset;
+ height = scrollbar_info[ED_SCROLLBAR_VERTICAL].height + yoffset;
+
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+ GDI_WIDTH, width,
+ GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldx,
+ GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+ GDI_HEIGHT, height,
+ GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldy,
+ GDI_END);
+}
+
+static void AdjustLevelScrollPosition()
{
if (level_xpos < -1)
level_xpos = -1;
- if (level_xpos > lev_fieldx - ED_FIELDX + 1)
- level_xpos = lev_fieldx - ED_FIELDX + 1;
- if (lev_fieldx < ED_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 - ED_FIELDY + 1)
- level_ypos = lev_fieldy - ED_FIELDY + 1;
- if (lev_fieldy < ED_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)
+static void AdjustEditorScrollbar(int id)
{
struct GadgetInfo *gi = level_editor_gadget[id];
int items_max, items_visible, item_position;
- if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
+ if (id == GADGET_ID_SCROLL_HORIZONTAL)
{
- items_max = MAX(lev_fieldx + 2, ED_FIELDX);
- items_visible = ED_FIELDX;
+ items_max = MAX(lev_fieldx + 2, ed_fieldx);
+ items_visible = ed_fieldx;
item_position = level_xpos + 1;
}
else
{
- items_max = MAX(lev_fieldy + 2, ED_FIELDY);
- items_visible = ED_FIELDY;
+ items_max = MAX(lev_fieldy + 2, ed_fieldy);
+ items_visible = ed_fieldy;
item_position = level_ypos + 1;
}
if (item_position > items_max - items_visible)
item_position = items_max - items_visible;
- AdjustScrollbar(gi, items_max, item_position);
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+ GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
}
-void ModifyEditorTextInput(int textinput_id, char *new_text)
+static 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);
+ ModifyGadget(gi, GDI_TEXT_VALUE, new_text, GDI_END);
}
-void ModifyEditorCounter(int counter_id, int new_value)
+static 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);
+ ModifyGadget(gi, GDI_NUMBER_VALUE, new_value, GDI_END);
if (counter_value != NULL)
*counter_value = gi->text.number_value;
redraw_mask |= REDRAW_DOOR_1;
}
-void LevelEd(int mx, int my, int button)
-{
- static int last_button = 0;
-
- /*
- static int in_field_pressed = FALSE;
- */
-
- static boolean use_floodfill = FALSE;
-
-
- /*
- int x = (mx-SX)/MINI_TILEX;
- int y = (my-SY)/MINI_TILEY;
- */
-
- /*
- HandlePressedControlButtons();
- HandleDrawingFunctions(mx, my, button);
- */
-
- if (use_floodfill) /********** FLOOD FILL **********/
- {
-
-
-#if 0
-
- if (button)
- {
- if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
- {
- int from_x, from_y;
- int fill_element;
-
- if (x>lev_fieldx || y>lev_fieldy ||
- (x==0 && level_xpos<0) ||
- (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
- (y==0 && level_ypos<0) ||
- (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY))
- return;
-
- from_x = x+level_xpos;
- from_y = y+level_ypos;
- fill_element = (button==1 ? new_element1 :
- button==2 ? new_element2 :
- button==3 ? new_element3 : 0);
-
- FloodFill(from_x,from_y,fill_element);
- DrawMiniLevel(level_xpos,level_ypos);
- }
-
- use_floodfill = FALSE;
- CloseDoor(DOOR_CLOSE_1);
- OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
- }
- return;
-
-#endif
-
-
-
- }
- else /********** EDIT/CTRL-FENSTER **********/
- {
- static unsigned long choice_delay = 0;
- int choice = CheckElemButtons(mx,my,button);
- int elem_pos = choice-ED_BUTTON_ELEM;
-
- if (((choice == ED_BUTTON_EUP && element_shift>0) ||
- (choice == ED_BUTTON_EDOWN &&
- element_shift<elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)) &&
- DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- {
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
- int i;
-
-#if 0
- step = (button==1 ? MAX_ELEM_X : button==2 ? 5*MAX_ELEM_X :
- elements_in_list);
- element_shift += (choice==ED_BUTTON_EUP ? -step : step);
-#else
- step = step * MAX_ELEM_X * (choice == ED_BUTTON_EUP ? -1 : +1);
- element_shift += step;
-#endif
-
- if (element_shift<0)
- element_shift = 0;
- if (element_shift>elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)
- element_shift = elements_in_list-MAX_ELEM_X*MAX_ELEM_Y;
- if (element_shift % MAX_ELEM_X)
- element_shift += MAX_ELEM_X-(element_shift % MAX_ELEM_X);
-
- for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
- DrawElemButton(i+2,ED_BUTTON_RELEASED);
- }
- else if (elem_pos>=0 && elem_pos<MAX_ELEM_X*MAX_ELEM_Y)
- {
- int new_element;
-
- if (elem_pos+element_shift < elements_in_list)
- new_element = editor_element[elem_pos+element_shift];
- else
- new_element = EL_LEERRAUM;
-
- PickDrawingElement(last_button, new_element);
-
- if (!HAS_CONTENT(properties_element))
- {
- properties_element = new_element;
- if (edit_mode == ED_MODE_PROPERTIES)
- DrawPropertiesWindow();
- }
- }
-
- if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/
- {
-
-
-
-#if 0
-
- switch(CheckEditButtons(mx,my,button))
- {
- case ED_BUTTON_CTRL:
- CloseDoor(DOOR_CLOSE_2);
- DrawControlWindow();
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4,DOOR_GFX_PAGEY1+80,
- VXSIZE,VYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
- OpenDoor(DOOR_OPEN_2);
- edit_mode = ED_MODE_INFO;
- break;
- case ED_BUTTON_FILL:
- Request("Caution ! Flood fill mode ! Choose area !",REQ_OPEN);
- use_floodfill = TRUE;
- return;
- break;
- case ED_BUTTON_LEFT:
- if (level_xpos>=0)
- {
- if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- break;
- if (lev_fieldx<ED_FIELDX-2)
- break;
-
- level_xpos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
- if (level_xpos<-1)
- level_xpos = -1;
- if (button==1)
- ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_RIGHT);
- else
- DrawMiniLevel(level_xpos,level_ypos);
- }
- break;
- case ED_BUTTON_RIGHT:
- if (level_xpos<=lev_fieldx-ED_FIELDX)
- {
- if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- break;
- if (lev_fieldx<ED_FIELDX-2)
- break;
-
- level_xpos += (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
- 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);
- }
- break;
- case ED_BUTTON_UP:
- if (level_ypos>=0)
- {
- if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- break;
- if (lev_fieldy<ED_FIELDY-2)
- break;
-
- level_ypos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
- if (level_ypos<-1)
- level_ypos = -1;
- if (button==1)
- ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_DOWN);
- else
- DrawMiniLevel(level_xpos,level_ypos);
- }
- break;
- case ED_BUTTON_DOWN:
- if (level_ypos<=lev_fieldy-ED_FIELDY)
- {
- if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- break;
- if (lev_fieldy<ED_FIELDY-2)
- break;
-
- level_ypos += (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
- 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);
- }
- break;
- default:
- break;
- }
-
-#endif
-
-
-
-#if 0
-
- if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
- {
- int new_element;
-
- if (button && !motion_status)
- in_field_pressed = TRUE;
-
- if (!button || !in_field_pressed || button<1 || button>3 ||
- (y==0 && level_ypos<0) ||
- (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY) ||
- (x==0 && level_xpos<0) ||
- (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
- x>lev_fieldx || y>lev_fieldy)
- return;
-
- new_element = (button==1 ? new_element1 :
- button==2 ? new_element2 :
- button==3 ? new_element3 : 0);
-
- if (new_element != Feld[x+level_xpos][y+level_ypos])
- {
- if (new_element==EL_SPIELFIGUR) /* Jeder nur EINE Figur bitte... */
- {
- int x,y;
-
- for(x=0;x<lev_fieldx;x++) for(y=0;y<lev_fieldy;y++)
- {
- if (Feld[x][y]==EL_SPIELFIGUR || Feld[x][y]==EL_SPIELER1)
- {
- Feld[x][y] = EL_LEERRAUM;
- 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);
- }
- }
- }
-
- Feld[x+level_xpos][y+level_ypos] = new_element;
- DrawMiniElement(x,y,new_element);
- }
- }
- else if (!motion_status) /* Mauszeiger nicht im Level-Feld */
- in_field_pressed = FALSE;
-
-#endif
-
-
-
- }
- 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);
-
- if (choice >= 0 && choice < 36 &&
- DelayReached(&choice_delay, GADGET_FRAME_DELAY))
- {
- if (!(choice % 2))
- step = -step;
-
- choice /= 2;
-
- if (choice<11)
- {
- level.score[choice] += step;
- if (level.score[choice]<0)
- level.score[choice] = 0;
- else if (level.score[choice]>255)
- level.score[choice] = 255;
- }
- else if (choice==11)
- {
- level.tempo_amoebe += step;
- if (level.tempo_amoebe<0)
- level.tempo_amoebe = 0;
- else if (level.tempo_amoebe>255)
- level.tempo_amoebe = 255;
- }
- else if (choice==12)
- {
- level.dauer_sieb += step;
- if (level.dauer_sieb<0)
- level.dauer_sieb = 0;
- else if (level.dauer_sieb>255)
- level.dauer_sieb = 255;
- }
- else if (choice==13)
- {
- level.dauer_ablenk += step;
- if (level.dauer_ablenk<0)
- level.dauer_ablenk = 0;
- else if (level.dauer_ablenk>255)
- level.dauer_ablenk = 255;
- }
- else if (choice==14)
- {
- level.edelsteine += step;
- if (level.edelsteine<0)
- level.edelsteine = 0;
- else if (level.edelsteine>999)
- level.edelsteine = 999;
- }
- else if (choice==15)
- {
- level.time += step;
- if (level.time<0)
- level.time = 0;
- else if (level.time>999)
- level.time = 999;
- }
- else if (choice==16)
- {
- lev_fieldx += step;
- if (lev_fieldx<MIN_LEV_FIELDX)
- lev_fieldx = MIN_LEV_FIELDX;
- else if (lev_fieldx>MAX_LEV_FIELDX)
- lev_fieldx = MAX_LEV_FIELDX;
- level.fieldx = lev_fieldx;
- }
- else if (choice==17)
- {
- lev_fieldy += step;
- if (lev_fieldy<MIN_LEV_FIELDY)
- lev_fieldy = MIN_LEV_FIELDY;
- else if (lev_fieldy>MAX_LEV_FIELDY)
- lev_fieldy = MAX_LEV_FIELDY;
- level.fieldy = lev_fieldy;
- }
-
- if (choice<11)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE,
- int2str(level.score[choice],3),FS_SMALL,FC_YELLOW);
- else if (choice==11)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+11*ED_COUNT_GADGET_YSIZE,
- int2str(level.tempo_amoebe,3),FS_SMALL,FC_YELLOW);
- else if (choice==12)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+12*ED_COUNT_GADGET_YSIZE,
- int2str(level.dauer_sieb,3),FS_SMALL,FC_YELLOW);
- else if (choice==13)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+13*ED_COUNT_GADGET_YSIZE,
- int2str(level.dauer_ablenk,3),FS_SMALL,FC_YELLOW);
- else if (choice==14)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+14*ED_COUNT_GADGET_YSIZE,
- int2str(level.edelsteine,3),FS_SMALL,FC_YELLOW);
- else if (choice==15)
- DrawText(ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+15*ED_COUNT_GADGET_YSIZE,
- int2str(level.time,3),FS_SMALL,FC_YELLOW);
- else if (choice==16)
- DrawText(ED_SIZE_VALUE_XPOS,
- ED_SIZE_VALUE_YPOS+0*ED_SIZE_GADGET_YSIZE,
- int2str(level.fieldx,3),FS_SMALL,FC_YELLOW);
- else if (choice==17)
- DrawText(ED_SIZE_VALUE_XPOS,
- ED_SIZE_VALUE_YPOS+1*ED_SIZE_GADGET_YSIZE,
- int2str(level.fieldy,3),FS_SMALL,FC_YELLOW);
-
- redraw_mask &= ~REDRAW_FIELD;
- if (choice<16)
- XCopyArea(display,drawto,window,gc,
- ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE,
- 3*FONT2_XSIZE,FONT2_YSIZE,
- ED_COUNT_VALUE_XPOS,
- ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE);
- else
- XCopyArea(display,drawto,window,gc,
- ED_SIZE_VALUE_XPOS,
- ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE,
- 3*FONT2_XSIZE,FONT2_YSIZE,
- ED_SIZE_VALUE_XPOS,
- ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE);
- XFlush(display);
- }
-
- switch(CheckCtrlButtons(mx,my,button))
- {
- case ED_BUTTON_EDIT:
- CloseDoor(DOOR_CLOSE_2);
- AdjustLevelScrollPosition();
- DrawMiniLevel(level_xpos,level_ypos);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY2,
- VXSIZE,VYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
- OpenDoor(DOOR_OPEN_2);
- edit_mode = ED_MODE_DRAWING;
- break;
- case ED_BUTTON_CLEAR:
- if (Request("Are you sure to clear this level ?",REQ_ASK))
- {
- for(x=0;x<MAX_LEV_FIELDX;x++)
- for(y=0;y<MAX_LEV_FIELDY;y++)
- Feld[x][y] = EL_ERDREICH;
- DrawMiniLevel(level_xpos,level_ypos);
- }
- break;
- case ED_BUTTON_UNDO:
- if (leveldir[leveldir_nr].readonly ||
- Request("Exit without saving ?",REQ_ASK | REQ_STAY_OPEN))
- {
- CloseDoor(DOOR_CLOSE_ALL);
- game_status=MAINMENU;
- DrawMainMenu();
- }
- else
- {
- CloseDoor(DOOR_CLOSE_1);
- OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
- }
- break;
- case ED_BUTTON_EXIT:
- {
- int figur_vorhanden = FALSE;
-
- if (leveldir[leveldir_nr].readonly)
- {
- Request("This level is read only !",REQ_CONFIRM);
- 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 ||
- Feld[x][y] == EL_SP_MURPHY)
- figur_vorhanden = TRUE;
-
- if (!figur_vorhanden)
- Request("No Level without Gregor Mc Duffin please !",
- REQ_CONFIRM);
- else
- {
- if (Request("Save this level and kill the old ?",
- REQ_ASK | REQ_STAY_OPEN))
- {
- for(x=0;x<lev_fieldx;x++)
- for(y=0;y<lev_fieldy;y++)
- Ur[x][y]=Feld[x][y];
- SaveLevel(level_nr);
- }
- CloseDoor(DOOR_CLOSE_ALL);
- game_status=MAINMENU;
- DrawMainMenu();
- }
- }
- break;
- default:
- break;
- }
-
- 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 &&
- my<ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE+ED_WIN_COUNT_YSIZE)
- {
- if (!name_typing)
- {
- name_typing = TRUE;
- DrawText(ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_GREEN);
- DrawText(ED_COUNT_GADGET_XPOS+5+strlen(level.name)*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- "<",FS_SMALL,FC_RED);
- }
- }
- else
- {
- if (name_typing)
- {
- name_typing = FALSE;
- DrawText(ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_YELLOW);
- DrawText(ED_COUNT_GADGET_XPOS+5+strlen(level.name)*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- " ",FS_SMALL,FC_RED);
- }
- }
-
- if (mx>=SX+29*MINI_TILEX && mx<SX+30*MINI_TILEX &&
- my>=SY+26*MINI_TILEY && my<SY+27*MINI_TILEY)
- {
- int new_element;
-
- if (!button || button<1 || button>3)
- return;
-
- new_element = (button==1 ? new_element1 :
- button==2 ? new_element2 :
- button==3 ? new_element3 : 0);
-
- if (new_element != level.amoebe_inhalt)
- {
- level.amoebe_inhalt = new_element;
- DrawMiniElement(29,26,new_element);
- }
- }
-
- if (mx>=SX+1*MINI_TILEX && mx<SX+(1+4*5)*MINI_TILEX &&
- my>=SY+2*MINI_TILEY && my<SY+(2+3)*MINI_TILEY)
- {
- int x = (mx-SX-1*MINI_TILEX)/MINI_TILEX;
- int y = (my-SY-2*MINI_TILEY)/MINI_TILEY;
- int i = x/5;
- int new_element;
-
- x = x-i*5;
- if (i>=0 && i<43 && x>=0 && x<3 && y>=0 && y<3)
- {
- if (button && !motion_status)
- in_field_pressed = TRUE;
-
- if (!button || !in_field_pressed || button<1 || button>3)
- return;
-
- new_element = (button==1 ? new_element1 :
- button==2 ? new_element2 :
- button==3 ? new_element3 : 0);
-
- if (new_element != level.mampfer_inhalt[i][x][y])
- {
- level.mampfer_inhalt[i][x][y] = new_element;
- DrawMiniElement(1+5*i+x,2+y,new_element);
- }
- }
- else if (!motion_status)/* Mauszeiger nicht im Cruncher-Feld */
- in_field_pressed = FALSE;
- }
- else if (!motion_status) /* Mauszeiger nicht im Cruncher-Feld */
- in_field_pressed = FALSE;
-
-#endif
-
-
-
- }
- }
-
- last_button = button;
-
- BackToFront();
-}
-
-void LevelNameTyping(KeySym key)
-{
- unsigned char ascii = 0;
- int len = strlen(level.name);
-
- if (!name_typing)
- return;
-
- if (key>=XK_A && key<=XK_Z)
- ascii = 'A'+(char)(key-XK_A);
- else if (key>=XK_a && key<=XK_z)
- ascii = 'a'+(char)(key-XK_a);
- else if (key>=XK_0 && key<=XK_9)
- ascii = '0'+(char)(key-XK_0);
-#ifdef XK_LATIN1
- else if (key>=XK_space && key<=XK_at)
- ascii = ' '+(char)(key-XK_space);
- else if (key==XK_Adiaeresis)
- ascii = 'Ä';
- else if (key==XK_Odiaeresis)
- ascii = 'Ö';
- else if (key==XK_Udiaeresis)
- ascii = 'Ü';
- else if (key==XK_adiaeresis)
- ascii = 'ä';
- else if (key==XK_odiaeresis)
- ascii = 'ö';
- else if (key==XK_udiaeresis)
- ascii = 'ü';
- else if (key==XK_underscore)
- ascii = '_';
-#endif
-
- if (ascii && len<MAX_LEVEL_NAME_LEN-2)
- {
- level.name[len] = ascii;
- level.name[len+1] = 0;
- len++;
-
- DrawTextExt(drawto,gc,
- ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_GREEN);
- DrawTextExt(window,gc,
- ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_GREEN);
- DrawTextExt(drawto,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- "<",FS_SMALL,FC_RED);
- DrawTextExt(window,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- "<",FS_SMALL,FC_RED);
- }
- else if ((key==XK_Delete || key==XK_BackSpace) && len>0)
- {
- level.name[len-1] = 0;
- len--;
-
- DrawTextExt(drawto,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- "< ",FS_SMALL,FC_GREEN);
- DrawTextExt(window,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- "< ",FS_SMALL,FC_GREEN);
- }
- else if (key==XK_Return)
- {
- DrawTextExt(drawto,gc,
- ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_YELLOW);
- DrawTextExt(window,gc,
- ED_COUNT_GADGET_XPOS+5,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- level.name,FS_SMALL,FC_YELLOW);
- DrawTextExt(drawto,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- " ",FS_SMALL,FC_YELLOW);
- DrawTextExt(window,gc,
- ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
- ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
- " ",FS_SMALL,FC_YELLOW);
-
- name_typing = FALSE;
- }
-}
-
static void DrawCounterValueField(int counter_id, int value)
{
int x = SX + counterbutton_info[counter_id].x + ED_WIN_COUNT_XPOS;
{
ClearWindow();
UnmapLevelEditorWindowGadgets();
+ AdjustDrawingAreaGadgets();
AdjustLevelScrollPosition();
- AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_HORIZONTAL);
- AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_VERTICAL);
- DrawMiniLevel(level_xpos, level_ypos);
+ AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
+ AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
MapMainDrawingArea();
}
ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
for (i=0; i<MAX_ELEM_CONTENT; i++)
- UnmapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
+ UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
/* display counter to choose number of element content areas */
gadget_elem_content_value = num_areas;
}
for (i=0; i<*num_areas; i++)
- MapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
+ MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
}
static void DrawAmoebaContentArea()
DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
- MapDrawingArea(ED_CTRL_ID_AMOEBA_CONTENT);
+ MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
}
#define TEXT_COLLECTING "Score for collecting"
static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
int button, int mode)
{
- static short brush_buffer[ED_FIELDX][ED_FIELDY];
+ static short brush_buffer[MAX_ED_FIELDX][MAX_ED_FIELDY];
static int brush_width, brush_height;
static int last_cursor_x = -1, last_cursor_y = -1;
static boolean delete_old_brush;
delete_buffer[sx - start_sx] = Feld[lx][ly];
Feld[lx][ly] = letter_element;
- if (sx + 1 < ED_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 < ED_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 < ED_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);
}
}
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
Feld[x][y] =
FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
}
{
static boolean started_inside_drawing_area = FALSE;
int id = gi->custom_id;
- boolean inside_drawing_area = !gi->event.off_borders;
boolean button_press_event;
boolean button_release_event;
- boolean draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL);
+ boolean inside_drawing_area = !gi->event.off_borders;
+ boolean draw_level = (id == GADGET_ID_DRAWING_LEVEL);
int new_element;
int button = gi->event.button;
int sx = gi->event.x, sy = gi->event.y;
lx = sx + level_xpos;
ly = sy + level_ypos;
+ if (!IN_LEV_FIELD(lx, ly))
+ inside_drawing_area = FALSE;
+
/* 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);
#endif
- if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
+ if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
return;
switch (drawing_function)
{
- case ED_CTRL_ID_SINGLE_ITEMS:
+ case GADGET_ID_SINGLE_ITEMS:
if (draw_level)
{
if (button_release_event)
if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
{
Feld[x][y] = EL_LEERRAUM;
- if (x - level_xpos >= 0 && x - level_xpos < ED_FIELDX &&
- y - level_ypos >= 0 && y - level_ypos < ED_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);
}
gi->y + sy * MINI_TILEY,
el2gfx(new_element));
- if (id == ED_CTRL_ID_AMOEBA_CONTENT)
+ if (id == GADGET_ID_AMOEBA_CONTENT)
level.amoebe_inhalt = new_element;
- else if (id >= ED_CTRL_ID_ELEM_CONTENT_0 &&
- id <= ED_CTRL_ID_ELEM_CONTENT_7)
- level.mampfer_inhalt[id - ED_CTRL_ID_ELEM_CONTENT_0][sx][sy] =
+ else if (id >= GADGET_ID_ELEM_CONTENT_0 &&
+ id <= GADGET_ID_ELEM_CONTENT_7)
+ level.mampfer_inhalt[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
new_element;
}
break;
- case ED_CTRL_ID_CONNECTED_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
{
static int last_sx = -1;
static int last_sy = -1;
}
break;
- case ED_CTRL_ID_LINE:
- case ED_CTRL_ID_ARC:
- case ED_CTRL_ID_RECTANGLE:
- case ED_CTRL_ID_FILLED_BOX:
- case ED_CTRL_ID_GRAB_BRUSH:
- case ED_CTRL_ID_TEXT:
+ case GADGET_ID_LINE:
+ case GADGET_ID_ARC:
+ case GADGET_ID_RECTANGLE:
+ case GADGET_ID_FILLED_BOX:
+ case GADGET_ID_GRAB_BRUSH:
+ case GADGET_ID_TEXT:
{
static int last_sx = -1;
static int last_sy = -1;
static int start_sy = -1;
void (*draw_func)(int, int, int, int, int, boolean);
- if (drawing_function == ED_CTRL_ID_LINE)
+ if (drawing_function == GADGET_ID_LINE)
draw_func = DrawLine;
- else if (drawing_function == ED_CTRL_ID_ARC)
+ else if (drawing_function == GADGET_ID_ARC)
draw_func = DrawArc;
- else if (drawing_function == ED_CTRL_ID_RECTANGLE)
+ else if (drawing_function == GADGET_ID_RECTANGLE)
draw_func = DrawRectangle;
- else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
+ else if (drawing_function == GADGET_ID_FILLED_BOX)
draw_func = DrawFilledBox;
- else if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+ else if (drawing_function == GADGET_ID_GRAB_BRUSH)
draw_func = SelectArea;
- else /* (drawing_function == ED_CTRL_ID_TEXT) */
+ else /* (drawing_function == GADGET_ID_TEXT) */
draw_func = SetTextCursor;
if (button_press_event)
start_sx = last_sx = sx;
start_sy = last_sy = sy;
- if (drawing_function == ED_CTRL_ID_TEXT)
+ if (drawing_function == GADGET_ID_TEXT)
DrawLevelText(0, 0, 0, TEXT_END);
}
else if (button_release_event)
{
draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
- if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+ if (drawing_function == GADGET_ID_GRAB_BRUSH)
{
CopyAreaToBrush(start_sx, start_sy, sx, sy, button);
CopyBrushToCursor(sx, sy);
- ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]);
draw_with_brush = TRUE;
}
- else if (drawing_function == ED_CTRL_ID_TEXT)
+ else if (drawing_function == GADGET_ID_TEXT)
DrawLevelText(sx, sy, 0, TEXT_INIT);
else
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
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:
+ case GADGET_ID_FLOOD_FILL:
if (button_press_event && Feld[lx][ly] != new_element)
{
FloodFill(lx, ly, new_element);
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
break;
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_PICK_ELEMENT:
if (button_press_event)
PickDrawingElement(button, Feld[lx][ly]);
if (button_release_event)
switch (id)
{
- case ED_CTRL_ID_ELEM_SCORE_DOWN:
- case ED_CTRL_ID_ELEM_SCORE_UP:
- step *= (id == ED_CTRL_ID_ELEM_SCORE_DOWN ? -1 : 1);
+ case GADGET_ID_ELEM_SCORE_DOWN:
+ case GADGET_ID_ELEM_SCORE_UP:
+ step *= (id == GADGET_ID_ELEM_SCORE_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE,
*gadget_elem_score_value + step);
break;
- case ED_CTRL_ID_ELEM_SCORE_TEXT:
+ case GADGET_ID_ELEM_SCORE_TEXT:
*gadget_elem_score_value = gi->text.number_value;
break;
- case ED_CTRL_ID_ELEM_CONTENT_DOWN:
- case ED_CTRL_ID_ELEM_CONTENT_UP:
- step *= (id == ED_CTRL_ID_ELEM_CONTENT_DOWN ? -1 : 1);
+ case GADGET_ID_ELEM_CONTENT_DOWN:
+ case GADGET_ID_ELEM_CONTENT_UP:
+ step *= (id == GADGET_ID_ELEM_CONTENT_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT,
*gadget_elem_content_value + step);
DrawElementContentAreas();
break;
- case ED_CTRL_ID_ELEM_CONTENT_TEXT:
+ case GADGET_ID_ELEM_CONTENT_TEXT:
*gadget_elem_content_value = gi->text.number_value;
DrawElementContentAreas();
break;
- case ED_CTRL_ID_LEVEL_XSIZE_DOWN:
- case ED_CTRL_ID_LEVEL_XSIZE_UP:
- step *= (id == ED_CTRL_ID_LEVEL_XSIZE_DOWN ? -1 : 1);
+ case GADGET_ID_LEVEL_XSIZE_DOWN:
+ case GADGET_ID_LEVEL_XSIZE_UP:
+ step *= (id == GADGET_ID_LEVEL_XSIZE_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE,
*gadget_level_xsize_value + step);
level.fieldx = lev_fieldx;
break;
- case ED_CTRL_ID_LEVEL_XSIZE_TEXT:
+ case GADGET_ID_LEVEL_XSIZE_TEXT:
*gadget_level_xsize_value = gi->text.number_value;
level.fieldx = lev_fieldx;
break;
- case ED_CTRL_ID_LEVEL_YSIZE_DOWN:
- case ED_CTRL_ID_LEVEL_YSIZE_UP:
- step *= (id == ED_CTRL_ID_LEVEL_YSIZE_DOWN ? -1 : 1);
+ case GADGET_ID_LEVEL_YSIZE_DOWN:
+ case GADGET_ID_LEVEL_YSIZE_UP:
+ step *= (id == GADGET_ID_LEVEL_YSIZE_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE,
*gadget_level_ysize_value + step);
level.fieldy = lev_fieldy;
break;
- case ED_CTRL_ID_LEVEL_YSIZE_TEXT:
+ case GADGET_ID_LEVEL_YSIZE_TEXT:
*gadget_level_ysize_value = gi->text.number_value;
level.fieldy = lev_fieldy;
break;
- case ED_CTRL_ID_LEVEL_RANDOM_DOWN:
- case ED_CTRL_ID_LEVEL_RANDOM_UP:
- step *= (id == ED_CTRL_ID_LEVEL_RANDOM_DOWN ? -1 : 1);
+ case GADGET_ID_LEVEL_RANDOM_DOWN:
+ case GADGET_ID_LEVEL_RANDOM_UP:
+ step *= (id == GADGET_ID_LEVEL_RANDOM_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM,
*gadget_level_random_value + step);
break;
- case ED_CTRL_ID_LEVEL_RANDOM_TEXT:
+ case GADGET_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);
+ case GADGET_ID_LEVEL_COLLECT_DOWN:
+ case GADGET_ID_LEVEL_COLLECT_UP:
+ step *= (id == GADGET_ID_LEVEL_COLLECT_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT,
*gadget_level_collect_value + step);
break;
- case ED_CTRL_ID_LEVEL_COLLECT_TEXT:
+ case GADGET_ID_LEVEL_COLLECT_TEXT:
*gadget_level_collect_value = gi->text.number_value;
break;
- case ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN:
- case ED_CTRL_ID_LEVEL_TIMELIMIT_UP:
- step *= (id == ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1);
+ case GADGET_ID_LEVEL_TIMELIMIT_DOWN:
+ case GADGET_ID_LEVEL_TIMELIMIT_UP:
+ step *= (id == GADGET_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT,
*gadget_level_timelimit_value + step);
break;
- case ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT:
+ case GADGET_ID_LEVEL_TIMELIMIT_TEXT:
*gadget_level_timelimit_value = gi->text.number_value;
break;
- case ED_CTRL_ID_LEVEL_TIMESCORE_DOWN:
- case ED_CTRL_ID_LEVEL_TIMESCORE_UP:
- step *= (id == ED_CTRL_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1);
+ case GADGET_ID_LEVEL_TIMESCORE_DOWN:
+ case GADGET_ID_LEVEL_TIMESCORE_UP:
+ step *= (id == GADGET_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1);
ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE,
*gadget_level_timescore_value + step);
break;
- case ED_CTRL_ID_LEVEL_TIMESCORE_TEXT:
+ case GADGET_ID_LEVEL_TIMESCORE_TEXT:
*gadget_level_timescore_value = gi->text.number_value;
break;
switch (id)
{
- case ED_CTRL_ID_LEVEL_NAME:
+ case GADGET_ID_LEVEL_NAME:
strcpy(level.name, gi->text.value);
break;
- case ED_CTRL_ID_LEVEL_AUTHOR:
+ case GADGET_ID_LEVEL_AUTHOR:
strcpy(level.author, gi->text.value);
break;
int new_element;
int player_present = FALSE;
int level_changed = FALSE;
- int x, y;
+ int i, x, y;
new_element = (button == 1 ? new_element1 :
button == 2 ? new_element2 :
button == 3 ? new_element3 : 0);
- if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
+ if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
DrawLevelText(0, 0, 0, TEXT_END);
- if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES &&
+ if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES &&
edit_mode != ED_MODE_DRAWING)
{
DrawDrawingWindow();
switch (id)
{
- case ED_CTRL_ID_SCROLL_LEFT:
+ case GADGET_ID_SCROLL_LEFT:
if (level_xpos >= 0)
{
- int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
- struct GadgetScrollbar *gs = &gi->scrollbar;
- if (lev_fieldx < ED_FIELDX - 2)
+ if (lev_fieldx < ed_fieldx - 2)
break;
level_xpos -= step;
if (button == 1)
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
else
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
- case ED_CTRL_ID_SCROLL_RIGHT:
- if (level_xpos <= lev_fieldx - ED_FIELDX)
+ case GADGET_ID_SCROLL_RIGHT:
+ if (level_xpos <= lev_fieldx - ed_fieldx)
{
- int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+ int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
- struct GadgetScrollbar *gs = &gi->scrollbar;
- if (lev_fieldx < ED_FIELDX - 2)
+ if (lev_fieldx < ed_fieldx - 2)
break;
level_xpos += step;
- if (level_xpos > lev_fieldx - ED_FIELDX + 1)
- level_xpos = lev_fieldx - ED_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);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
- case ED_CTRL_ID_SCROLL_UP:
+ case GADGET_ID_SCROLL_UP:
if (level_ypos >= 0)
{
- int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ int gadget_id = GADGET_ID_SCROLL_VERTICAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
- struct GadgetScrollbar *gs = &gi->scrollbar;
- if (lev_fieldy < ED_FIELDY - 2)
+ if (lev_fieldy < ed_fieldy - 2)
break;
level_ypos -= step;
if (button == 1)
ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
else
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
- case ED_CTRL_ID_SCROLL_DOWN:
- if (level_ypos <= lev_fieldy - ED_FIELDY)
+ case GADGET_ID_SCROLL_DOWN:
+ if (level_ypos <= lev_fieldy - ed_fieldy)
{
- int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+ int gadget_id = GADGET_ID_SCROLL_VERTICAL;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
- struct GadgetScrollbar *gs = &gi->scrollbar;
- if (lev_fieldy < ED_FIELDY - 2)
+ if (lev_fieldy < ed_fieldy - 2)
break;
level_ypos += step;
- if (level_ypos > lev_fieldy - ED_FIELDY + 1)
- level_ypos = lev_fieldy - ED_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);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
- case ED_CTRL_ID_SCROLL_HORIZONTAL:
+ case GADGET_ID_SCROLL_HORIZONTAL:
level_xpos = gi->event.item_position - 1;
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
break;
- case ED_CTRL_ID_SCROLL_VERTICAL:
+ case GADGET_ID_SCROLL_VERTICAL:
level_ypos = gi->event.item_position - 1;
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+ break;
+
+ case GADGET_ID_ELEMENTLIST_UP:
+ case GADGET_ID_ELEMENTLIST_DOWN:
+ step *= (id == GADGET_ID_ELEMENTLIST_UP ? -1 : +1);
+ element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+
+ if (element_shift < 0)
+ element_shift = 0;
+ if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
+ element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+
+ for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+ {
+ int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+ struct GadgetDesign *design = &gi->deco.design;
+
+ UnmapGadget(gi);
+ getMiniGraphicSource(el2gfx(editor_element[element_shift + i]),
+ &design->pixmap, &design->x, &design->y);
+ MapGadget(gi);
+ }
break;
- case ED_CTRL_ID_WRAP_LEFT:
+ case GADGET_ID_WRAP_LEFT:
WrapLevel(-step, 0);
break;
- case ED_CTRL_ID_WRAP_RIGHT:
+ case GADGET_ID_WRAP_RIGHT:
WrapLevel(step, 0);
break;
- case ED_CTRL_ID_WRAP_UP:
+ case GADGET_ID_WRAP_UP:
WrapLevel(0, -step);
break;
- case ED_CTRL_ID_WRAP_DOWN:
+ case GADGET_ID_WRAP_DOWN:
WrapLevel(0, step);
break;
- case ED_CTRL_ID_SINGLE_ITEMS:
- case ED_CTRL_ID_CONNECTED_ITEMS:
- case ED_CTRL_ID_LINE:
- case ED_CTRL_ID_ARC:
- case ED_CTRL_ID_TEXT:
- case ED_CTRL_ID_RECTANGLE:
- case ED_CTRL_ID_FILLED_BOX:
- case ED_CTRL_ID_FLOOD_FILL:
- case ED_CTRL_ID_GRAB_BRUSH:
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_SINGLE_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
+ case GADGET_ID_LINE:
+ case GADGET_ID_ARC:
+ case GADGET_ID_TEXT:
+ case GADGET_ID_RECTANGLE:
+ case GADGET_ID_FILLED_BOX:
+ case GADGET_ID_FLOOD_FILL:
+ case GADGET_ID_GRAB_BRUSH:
+ case GADGET_ID_PICK_ELEMENT:
last_drawing_function = drawing_function;
drawing_function = id;
draw_with_brush = FALSE;
break;
- case ED_CTRL_ID_RANDOM_PLACEMENT:
+ case GADGET_ID_RANDOM_PLACEMENT:
RandomPlacement(button);
break;
- case ED_CTRL_ID_PROPERTIES:
+ case GADGET_ID_PROPERTIES:
if (edit_mode != ED_MODE_PROPERTIES)
{
properties_element = new_element;
}
break;
- case ED_CTRL_ID_UNDO:
+ case GADGET_ID_UNDO:
if (undo_buffer_steps == 0)
{
Request("Undo buffer empty !", REQ_CONFIRM);
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
Feld[x][y] = UndoBuffer[undo_buffer_position][x][y];
- DrawMiniLevel(level_xpos,level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos,level_ypos);
break;
- case ED_CTRL_ID_INFO:
+ case GADGET_ID_INFO:
if (edit_mode != ED_MODE_INFO)
{
DrawLevelInfoWindow();
}
break;
- case ED_CTRL_ID_CLEAR:
+ case GADGET_ID_CLEAR:
for(x=0; x<MAX_LEV_FIELDX; x++)
for(y=0; y<MAX_LEV_FIELDY; y++)
Feld[x][y] = new_element3;
- CopyLevelToUndoBuffer(ED_CTRL_ID_CLEAR);
+ CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
- DrawMiniLevel(level_xpos, level_ypos);
+ DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
break;
- case ED_CTRL_ID_SAVE:
+ case GADGET_ID_SAVE:
if (leveldir[leveldir_nr].readonly)
{
Request("This level is read only !", REQ_CONFIRM);
}
break;
- case ED_CTRL_ID_TEST:
+ case GADGET_ID_TEST:
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
if (Feld[x][y] == EL_SPIELFIGUR ||
}
break;
- case ED_CTRL_ID_EXIT:
+ case GADGET_ID_EXIT:
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
if (Feld[x][y] != Ur[x][y])
break;
default:
+ if (id >= GADGET_ID_ELEMENTLIST_FIRST &&
+ id <= GADGET_ID_ELEMENTLIST_LAST)
+ {
+ int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
+ int new_element = editor_element[element_position + element_shift];
+
+ PickDrawingElement(button, new_element);
+
+ if (!HAS_CONTENT(properties_element))
+ {
+ properties_element = new_element;
+ if (edit_mode == ED_MODE_PROPERTIES)
+ DrawPropertiesWindow();
+ }
+ }
#ifdef DEBUG
- if (gi->event.type == GD_EVENT_PRESSED)
+ else 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_RELEASED\n");
{
char letter = getCharFromKeySym(key);
- if (drawing_function == ED_CTRL_ID_TEXT)
+ if (drawing_function == GADGET_ID_TEXT)
{
if (letter)
DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
switch (key)
{
case XK_Left:
- id = ED_CTRL_ID_SCROLL_LEFT;
+ id = GADGET_ID_SCROLL_LEFT;
break;
case XK_Right:
- id = ED_CTRL_ID_SCROLL_RIGHT;
+ id = GADGET_ID_SCROLL_RIGHT;
break;
case XK_Up:
- id = ED_CTRL_ID_SCROLL_UP;
+ id = GADGET_ID_SCROLL_UP;
break;
case XK_Down:
- id = ED_CTRL_ID_SCROLL_DOWN;
+ id = GADGET_ID_SCROLL_DOWN;
break;
default:
- id = ED_CTRL_ID_NONE;
+ id = GADGET_ID_NONE;
break;
}
- if (id != ED_CTRL_ID_NONE)
+ if (id != GADGET_ID_NONE)
ClickOnGadget(level_editor_gadget[id]);
else if (letter == '.')
- ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS]);
else
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
if (letter && letter == control_info[i].shortcut)
{
sprintf(shortcut, " ('%s%c')",
(key >= 'A' && key <= 'Z' ? "Shift-" :
- gi->custom_id == ED_CTRL_ID_SINGLE_ITEMS ? ".' or '" : ""),
+ gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""),
key);
if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
ClearEditorGadgetInfoText();
- if (id == ED_CTRL_ID_DRAWING_LEVEL)
+ if (id == GADGET_ID_DRAWING_LEVEL)
{
if (button_status)
{
switch (drawing_function)
{
- case ED_CTRL_ID_SINGLE_ITEMS:
+ case GADGET_ID_SINGLE_ITEMS:
infotext = "Drawing single items";
break;
- case ED_CTRL_ID_CONNECTED_ITEMS:
+ case GADGET_ID_CONNECTED_ITEMS:
infotext = "Drawing connected items";
break;
- case ED_CTRL_ID_LINE:
+ case GADGET_ID_LINE:
infotext = "Drawing line";
break;
- case ED_CTRL_ID_ARC:
+ case GADGET_ID_ARC:
infotext = "Drawing arc";
break;
- case ED_CTRL_ID_TEXT:
+ case GADGET_ID_TEXT:
infotext = "Setting text cursor";
break;
- case ED_CTRL_ID_RECTANGLE:
+ case GADGET_ID_RECTANGLE:
infotext = "Drawing rectangle";
break;
- case ED_CTRL_ID_FILLED_BOX:
+ case GADGET_ID_FILLED_BOX:
infotext = "Drawing filled box";
break;
- case ED_CTRL_ID_FLOOD_FILL:
+ case GADGET_ID_FLOOD_FILL:
infotext = "Flood fill";
break;
- case ED_CTRL_ID_GRAB_BRUSH:
+ case GADGET_ID_GRAB_BRUSH:
infotext = "Grabbing brush";
break;
- case ED_CTRL_ID_PICK_ELEMENT:
+ case GADGET_ID_PICK_ELEMENT:
infotext = "Picking element";
break;
DeleteBrushFromCursor();
}
}
- else if (id == ED_CTRL_ID_AMOEBA_CONTENT)
+ else if (id == GADGET_ID_AMOEBA_CONTENT)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Amoeba content");
else
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Cruncher %d content: %d, %d",
- id - ED_CTRL_ID_ELEM_CONTENT_0 + 1, sx, sy);
+ id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
}
projects / rocksndiamonds.git / blobdiff