/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back! *
+* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-98 Artsoft Entertainment *
-* Holger Schemel *
-* Oststrasse 11a *
-* 33604 Bielefeld *
-* phone: ++49 +521 290471 *
-* email: aeglos@valinor.owl.de *
+* (c) 1995-2001 Artsoft Entertainment *
+* Holger Schemel *
+* Detmolder Strasse 189 *
+* 33604 Bielefeld *
+* Germany *
+* e-mail: info@artsoft.org *
*----------------------------------------------------------*
-* editor.c *
+* editor.c *
***********************************************************/
#include <math.h>
+#include "libgame/libgame.h"
+
#include "editor.h"
#include "screens.h"
#include "tools.h"
-#include "misc.h"
-#include "buttons.h"
#include "files.h"
#include "game.h"
#include "tape.h"
/* positions in the level editor */
-#define ED_WIN_MB_LEFT_XPOS 7
-#define ED_WIN_MB_LEFT_YPOS 6
-#define ED_WIN_LEVELNR_XPOS 77
-#define ED_WIN_LEVELNR_YPOS 7
-#define ED_WIN_MB_MIDDLE_XPOS 7
-#define ED_WIN_MB_MIDDLE_YPOS 258
-#define ED_WIN_MB_RIGHT_XPOS 77
-#define ED_WIN_MB_RIGHT_YPOS 258
+#define ED_WIN_MB_LEFT_XPOS 6
+#define ED_WIN_MB_LEFT_YPOS 258
+#define ED_WIN_MB_MIDDLE_XPOS 42
+#define ED_WIN_MB_MIDDLE_YPOS ED_WIN_MB_LEFT_YPOS
+#define ED_WIN_MB_RIGHT_XPOS 78
+#define ED_WIN_MB_RIGHT_YPOS ED_WIN_MB_LEFT_YPOS
/* other constants for the editor */
#define ED_SCROLL_NO 0
#define MIN_SCORE 0
#define MAX_SCORE 255
-/* values for elements with content */
-#define MIN_ELEM_CONTENT 1
-#define MAX_ELEM_CONTENT 8
-
/* values for the control window */
#define ED_CTRL_BUTTONS_GFX_YPOS 236
#define ED_CTRL_BUTTONS_ALT_GFX_YPOS 142
#define ED_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_XPOS 5
#define ED_ELEMENTLIST_YPOS 30
-#define ED_ELEMENTLIST_ALT_YPOS 190
-#define ED_ELEMENTLIST_XSIZE 22
-#define ED_ELEMENTLIST_YSIZE 22
+#define ED_ELEMENTLIST_XSIZE 20
+#define ED_ELEMENTLIST_YSIZE 20
#define ED_ELEMENTLIST_BUTTONS_HORIZ 4
-#define ED_ELEMENTLIST_BUTTONS_VERT 10
+#define ED_ELEMENTLIST_BUTTONS_VERT 11
#define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \
ED_ELEMENTLIST_BUTTONS_VERT)
#define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX)
#define ED_AREA_RANDOM_BACKGROUND_YPOS (31 * MINI_TILEY)
-/* values for scrolling gadgets */
+/* values for scrolling gadgets for drawing area */
#define ED_SCROLLBUTTON_XPOS 24
#define ED_SCROLLBUTTON_YPOS 0
#define ED_SCROLLBAR_XPOS 24
#define ED_SCROLL_VERTICAL_XSIZE ED_SCROLLBUTTON_XSIZE
#define ED_SCROLL_VERTICAL_YSIZE (SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
+/* values for scrolling gadgets for element list */
+#define ED_SCROLLBUTTON2_XPOS 50
+#define ED_SCROLLBUTTON2_YPOS 0
+#define ED_SCROLLBAR2_XPOS 50
+#define ED_SCROLLBAR2_YPOS 20
+
+#define ED_SCROLLBUTTON2_XSIZE 10
+#define ED_SCROLLBUTTON2_YSIZE 10
+
+#define ED_SCROLL2_UP_XPOS 85
+#define ED_SCROLL2_UP_YPOS 30
+#define ED_SCROLL2_DOWN_XPOS ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_DOWN_YPOS (ED_SCROLL2_UP_YPOS + \
+ ED_ELEMENTLIST_BUTTONS_VERT * \
+ ED_ELEMENTLIST_YSIZE - \
+ ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XPOS ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_VERTICAL_YPOS (ED_SCROLL2_UP_YPOS + \
+ ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XSIZE ED_SCROLLBUTTON2_XSIZE
+#define ED_SCROLL2_VERTICAL_YSIZE (ED_ELEMENTLIST_BUTTONS_VERT * \
+ ED_ELEMENTLIST_YSIZE - \
+ 2 * ED_SCROLLBUTTON2_YSIZE)
+
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_XSIZE ED_BUTTON_COUNT_XSIZE
#define ED_CHECKBUTTON_YSIZE ED_BUTTON_COUNT_YSIZE
#define ED_CHECKBUTTON_UNCHECKED_XPOS ED_BUTTON_MINUS_XPOS
#define ED_CHECKBUTTON_CHECKED_XPOS ED_BUTTON_PLUS_XPOS
#define ED_CHECKBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 22)
-#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 88)
-
-#define GADGET_ID_NONE -1
+#define ED_RADIOBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 44)
+#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 66)
+
+/* some positions in the editor control window */
+#define ED_BUTTON_ELEM_XPOS 6
+#define ED_BUTTON_ELEM_YPOS 30
+#define ED_BUTTON_ELEM_XSIZE 22
+#define ED_BUTTON_ELEM_YSIZE 22
+
+/* some values for text input and counter gadgets */
+#define ED_BUTTON_COUNT_YPOS 60
+#define ED_BUTTON_COUNT_XSIZE 20
+#define ED_BUTTON_COUNT_YSIZE 20
+#define ED_WIN_COUNT_XPOS (2 + ED_BUTTON_COUNT_XSIZE + 2)
+#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_WIN_COUNT_XSIZE 52
+#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_WIN_COUNT2_XPOS 27
+#define ED_WIN_COUNT2_YPOS 3
+#define ED_WIN_COUNT2_XSIZE 46
+#define ED_WIN_COUNT2_YSIZE ED_BUTTON_COUNT_YSIZE
+
+#define ED_BUTTON_MINUS_XPOS 2
+#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2)
+#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE
+
+/* editor gadget identifiers */
/* drawing toolbox buttons */
+#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_LEVEL_TIMESCORE_DOWN 43
#define GADGET_ID_LEVEL_TIMESCORE_TEXT 44
#define GADGET_ID_LEVEL_TIMESCORE_UP 45
+#define GADGET_ID_SELECT_LEVEL_DOWN 46
+#define GADGET_ID_SELECT_LEVEL_TEXT 47
+#define GADGET_ID_SELECT_LEVEL_UP 48
/* drawing area identifiers */
-#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
+#define GADGET_ID_DRAWING_LEVEL 49
+#define GADGET_ID_ELEM_CONTENT_0 50
+#define GADGET_ID_ELEM_CONTENT_1 51
+#define GADGET_ID_ELEM_CONTENT_2 52
+#define GADGET_ID_ELEM_CONTENT_3 53
+#define GADGET_ID_ELEM_CONTENT_4 54
+#define GADGET_ID_ELEM_CONTENT_5 55
+#define GADGET_ID_ELEM_CONTENT_6 56
+#define GADGET_ID_ELEM_CONTENT_7 57
+#define GADGET_ID_AMOEBA_CONTENT 58
/* text input identifiers */
-#define GADGET_ID_LEVEL_NAME 56
-#define GADGET_ID_LEVEL_AUTHOR 57
+#define GADGET_ID_LEVEL_NAME 59
+#define GADGET_ID_LEVEL_AUTHOR 60
/* gadgets for scrolling of drawing area */
-#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 GADGET_ID_SCROLL_UP 61
+#define GADGET_ID_SCROLL_DOWN 62
+#define GADGET_ID_SCROLL_LEFT 63
+#define GADGET_ID_SCROLL_RIGHT 64
+#define GADGET_ID_SCROLL_HORIZONTAL 65
+#define GADGET_ID_SCROLL_VERTICAL 66
/* 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 GADGET_ID_SCROLL_LIST_UP 67
+#define GADGET_ID_SCROLL_LIST_DOWN 68
+#define GADGET_ID_SCROLL_LIST_VERTICAL 69
/* buttons for level settings */
-#define GADGET_ID_RANDOM_PERCENTAGE 106
-#define GADGET_ID_RANDOM_QUANTITY 107
-#define GADGET_ID_RANDOM_RESTRICTED 108
-#define GADGET_ID_DOUBLE_SPEED 109
-#define GADGET_ID_STICK_ELEMENT 110
+#define GADGET_ID_RANDOM_PERCENTAGE 70
+#define GADGET_ID_RANDOM_QUANTITY 71
+#define GADGET_ID_RANDOM_RESTRICTED 72
+#define GADGET_ID_DOUBLE_SPEED 73
+#define GADGET_ID_GRAVITY 74
+#define GADGET_ID_STICK_ELEMENT 75
+#define GADGET_ID_EM_SLIPPERY_GEMS 76
/* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND 111
+#define GADGET_ID_RANDOM_BACKGROUND 77
+
+/* gadgets for buttons in element list */
+#define GADGET_ID_ELEMENTLIST_FIRST 78
+#define GADGET_ID_ELEMENTLIST_LAST (78 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
-#define NUM_EDITOR_GADGETS 112
+#define NUM_EDITOR_GADGETS (GADGET_ID_ELEMENTLIST_LAST + 1)
/* radio button numbers */
#define RADIO_NR_NONE 0
#define ED_COUNTER_ID_LEVEL_TIMELIMIT 5
#define ED_COUNTER_ID_LEVEL_TIMESCORE 6
#define ED_COUNTER_ID_LEVEL_RANDOM 7
+#define ED_COUNTER_ID_SELECT_LEVEL 8
-#define ED_NUM_COUNTERBUTTONS 8
+#define ED_NUM_COUNTERBUTTONS 9
#define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE
#define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM
#define ED_NUM_SCROLLBUTTONS 6
+#define ED_SCROLLBUTTON_ID_AREA_FIRST ED_SCROLLBUTTON_ID_AREA_UP
+#define ED_SCROLLBUTTON_ID_AREA_LAST ED_SCROLLBUTTON_ID_AREA_RIGHT
+
/* values for scrollbar gadgets */
-#define ED_SCROLLBAR_ID_HORIZONTAL 0
-#define ED_SCROLLBAR_ID_VERTICAL 1
+#define ED_SCROLLBAR_ID_AREA_HORIZONTAL 0
+#define ED_SCROLLBAR_ID_AREA_VERTICAL 1
+#define ED_SCROLLBAR_ID_LIST_VERTICAL 2
-#define ED_NUM_SCROLLBARS 2
+#define ED_NUM_SCROLLBARS 3
+
+#define ED_SCROLLBAR_ID_AREA_FIRST ED_SCROLLBAR_ID_AREA_HORIZONTAL
+#define ED_SCROLLBAR_ID_AREA_LAST ED_SCROLLBAR_ID_AREA_VERTICAL
/* values for text input gadgets */
#define ED_TEXTINPUT_ID_LEVEL_NAME 0
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0
-#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 1
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT 2
+#define ED_CHECKBUTTON_ID_GRAVITY 1
+#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 2
+#define ED_CHECKBUTTON_ID_STICK_ELEMENT 3
+#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 4
-#define ED_NUM_CHECKBUTTONS 3
+#define ED_NUM_CHECKBUTTONS 5
#define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED
#define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
/* values for radiobutton gadgets */
#define ED_RADIOBUTTON_ID_PERCENTAGE 0
-#define ED_RADIOBUTTON_ID_QUANTITY 1
+#define ED_RADIOBUTTON_ID_QUANTITY 1
#define ED_NUM_RADIOBUTTONS 2
{ 'E', "exit level editor" }
};
-/* pointers to counter values */
-static int *gadget_elem_score_value = NULL;
-static int *gadget_elem_content_value = NULL;
-static int *gadget_level_xsize_value = NULL;
-static int *gadget_level_ysize_value = NULL;
-static int *gadget_level_random_value = NULL;
-static int *gadget_level_collect_value = NULL;
-static int *gadget_level_timelimit_value = NULL;
-static int *gadget_level_timescore_value = NULL;
+/* values for random placement */
+#define RANDOM_USE_PERCENTAGE 0
+#define RANDOM_USE_QUANTITY 1
+
+static int random_placement_value = 10;
+static int random_placement_method = RANDOM_USE_QUANTITY;
+static int random_placement_background_element = EL_ERDREICH;
+static boolean random_placement_background_restricted = FALSE;
+static boolean stick_element_properties_window = FALSE;
static struct
{
int min_value, max_value;
int gadget_id_down, gadget_id_up;
int gadget_id_text;
- int **counter_value;
+ int *value;
char *infotext_above, *infotext_right;
} counterbutton_info[ED_NUM_COUNTERBUTTONS] =
{
MIN_SCORE, MAX_SCORE,
GADGET_ID_ELEM_SCORE_DOWN, GADGET_ID_ELEM_SCORE_UP,
GADGET_ID_ELEM_SCORE_TEXT,
- &gadget_elem_score_value,
+ NULL, /* will be set when used */
"element score", NULL
},
{
ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS,
- MIN_ELEM_CONTENT, MAX_ELEM_CONTENT,
+ MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS,
GADGET_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP,
GADGET_ID_ELEM_CONTENT_TEXT,
- &gadget_elem_content_value,
+ &level.num_yam_contents,
"element content", NULL
},
{
MIN_LEV_FIELDX, MAX_LEV_FIELDX,
GADGET_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP,
GADGET_ID_LEVEL_XSIZE_TEXT,
- &gadget_level_xsize_value,
+ &level.fieldx,
"playfield size", "width",
},
{
MIN_LEV_FIELDY, MAX_LEV_FIELDY,
GADGET_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP,
GADGET_ID_LEVEL_YSIZE_TEXT,
- &gadget_level_ysize_value,
+ &level.fieldy,
NULL, "height",
},
{
0, 999,
GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP,
GADGET_ID_LEVEL_COLLECT_TEXT,
- &gadget_level_collect_value,
+ &level.gems_needed,
"number of emeralds to collect", NULL
},
{
0, 999,
GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP,
GADGET_ID_LEVEL_TIMELIMIT_TEXT,
- &gadget_level_timelimit_value,
+ &level.time,
"time available to solve level", "(0 => no time limit)"
},
{
0, 255,
GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP,
GADGET_ID_LEVEL_TIMESCORE_TEXT,
- &gadget_level_timescore_value,
+ &level.score[SC_ZEITBONUS],
"score for each 10 seconds left", NULL
},
{
1, 100,
GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP,
GADGET_ID_LEVEL_RANDOM_TEXT,
- &gadget_level_random_value,
+ &random_placement_value,
"random element placement", "in"
+ },
+ {
+ DX + 5 - SX, DY + 3 - SY,
+ 1, 100,
+ GADGET_ID_SELECT_LEVEL_DOWN, GADGET_ID_SELECT_LEVEL_UP,
+ GADGET_ID_SELECT_LEVEL_TEXT,
+ &level_nr,
+ NULL, NULL
}
};
"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,
+ ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 0 * ED_SCROLLBUTTON2_YSIZE,
+ ED_SCROLL2_UP_XPOS, ED_SCROLL2_UP_YPOS,
+ GADGET_ID_SCROLL_LIST_UP,
"scroll element list up ('Page Up')"
},
{
- ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS,
- ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS,
- GADGET_ID_ELEMENTLIST_DOWN,
+ ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 1 * ED_SCROLLBUTTON2_YSIZE,
+ ED_SCROLL2_DOWN_XPOS, ED_SCROLL2_DOWN_YPOS,
+ GADGET_ID_SCROLL_LIST_DOWN,
"scroll element list down ('Page Down')"
}
};
} scrollbar_info[ED_NUM_SCROLLBARS] =
{
{
- ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
- ED_SCROLL_HORIZONTAL_XPOS, ED_SCROLL_HORIZONTAL_YPOS,
- ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE,
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ SX + ED_SCROLL_HORIZONTAL_XPOS, SY + ED_SCROLL_HORIZONTAL_YPOS,
+ ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE,
GD_TYPE_SCROLLBAR_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,
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ SX + ED_SCROLL_VERTICAL_XPOS, SY + 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"
+ },
+ {
+ ED_SCROLLBAR2_XPOS, ED_SCROLLBAR2_YPOS,
+ DX + ED_SCROLL2_VERTICAL_XPOS, DY + ED_SCROLL2_VERTICAL_YPOS,
+ ED_SCROLL2_VERTICAL_XSIZE, ED_SCROLL2_VERTICAL_YSIZE,
+ GD_TYPE_SCROLLBAR_VERTICAL,
+ GADGET_ID_SCROLL_LIST_VERTICAL,
+ "scroll element list vertically"
}
};
-/* values for random placement */
-#define RANDOM_USE_PERCENTAGE 0
-#define RANDOM_USE_QUANTITY 1
-
-static int random_placement_value = 10;
-static int random_placement_method = RANDOM_USE_QUANTITY;
-static int random_placement_background_element = EL_ERDREICH;
-static boolean random_placement_background_restricted = FALSE;
-static boolean stick_element_properties_window = FALSE;
-
static struct
{
int x, y;
&level.double_speed,
"double speed movement", "set movement speed of player"
},
+ {
+ ED_SETTINGS_XPOS + 340, ED_COUNTER_YPOS(6) - MINI_TILEY,
+ GADGET_ID_GRAVITY,
+ &level.gravity,
+ "gravity", "set level gravity"
+ },
{
ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(9) - MINI_TILEY,
GADGET_ID_RANDOM_RESTRICTED,
GADGET_ID_STICK_ELEMENT,
&stick_element_properties_window,
"stick window to edit content", "stick window to edit content"
+ },
+ {
+ ED_SETTINGS_XPOS, ED_COUNTER_YPOS(4),
+ GADGET_ID_EM_SLIPPERY_GEMS,
+ &level.em_slippery_gems,
+ "slip down from certain flat walls","use EM style slipping behaviour"
}
};
/* 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)
+#define IN_ED_FIELD(x,y) ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldy)
/* drawing elements on the three mouse buttons */
static int new_element1 = EL_MAUERWERK;
static int new_element2 = EL_LEERRAUM;
static int new_element3 = EL_ERDREICH;
-#define BUTTON_ELEMENT(button) (button == 1 ? new_element1 : \
- button == 2 ? new_element2 : \
- button == 3 ? new_element3 : EL_LEERRAUM)
+#define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
+ (button) == 2 ? new_element2 : \
+ (button) == 3 ? new_element3 : EL_LEERRAUM)
+#define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : (button) == 2 ? 5 : 10)
/* forward declaration for internal use */
+static void ModifyEditorCounter(int, int);
+static void ModifyEditorCounterLimits(int, int, int);
static void DrawDrawingWindow();
static void DrawLevelInfoWindow();
static void DrawPropertiesWindow();
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 HandleCounterButtons(struct GadgetInfo *);
static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleRadiobuttons(struct GadgetInfo *);
+static void HandleCheckbuttons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
+static void HandleDrawingAreaInfo(struct GadgetInfo *);
static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
static boolean draw_with_brush = FALSE;
static int properties_element = 0;
-static short ElementContent[MAX_ELEM_CONTENT][3][3];
+static short ElementContent[MAX_ELEMENT_CONTENTS][3][3];
static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static int undo_buffer_position = 0;
int editor_element[] =
{
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('U' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
+ EL_CHAR('B'),
+ EL_CHAR('O'),
+ EL_CHAR('U'),
+ EL_CHAR('L'),
- EL_CHAR_MINUS,
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
+ EL_CHAR('-'),
+ EL_CHAR('D'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('S' - 'A'),
- EL_CHAR_A + ('H' - 'A'),
+ EL_CHAR('D'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
+ EL_CHAR('H'),
EL_SPIELFIGUR,
EL_LEERRAUM,
EL_ERDREICH,
EL_BETON,
- EL_FELSBODEN,
- EL_SIEB2_INAKTIV,
+ EL_BD_WALL,
+ EL_MAGIC_WALL_BD_OFF,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_EDELSTEIN_BD,
- EL_BUTTERFLY_O,
- EL_FIREFLY_O,
- EL_FELSBROCKEN,
+ EL_BUTTERFLY_UP,
+ EL_FIREFLY_UP,
+ EL_BD_ROCK,
- EL_BUTTERFLY_L,
- EL_FIREFLY_L,
- EL_BUTTERFLY_R,
- EL_FIREFLY_R,
+ EL_BUTTERFLY_LEFT,
+ EL_FIREFLY_LEFT,
+ EL_BUTTERFLY_RIGHT,
+ EL_FIREFLY_RIGHT,
EL_AMOEBE_BD,
- EL_BUTTERFLY_U,
- EL_FIREFLY_U,
+ EL_BUTTERFLY_DOWN,
+ EL_FIREFLY_DOWN,
EL_LEERRAUM,
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_MINUS,
+ EL_CHAR('E'),
+ EL_CHAR('M'),
+ EL_CHAR('E'),
+ EL_CHAR('-'),
- EL_CHAR_A + ('R' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
- EL_CHAR_A + ('D' - 'A'),
+ EL_CHAR('R'),
+ EL_CHAR('A'),
+ EL_CHAR('L'),
+ EL_CHAR('D'),
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('I' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
+ EL_CHAR('M'),
+ EL_CHAR('I'),
+ EL_CHAR('N'),
+ EL_CHAR('E'),
EL_SPIELER1,
EL_SPIELER2,
EL_BETON,
EL_MAUERWERK,
EL_FELSBODEN,
- EL_SIEB_INAKTIV,
+ EL_MAGIC_WALL_OFF,
EL_EDELSTEIN,
EL_DIAMANT,
EL_MORAST_LEER,
EL_MORAST_VOLL,
- EL_DYNAMIT_AUS,
- EL_DYNAMIT,
+ EL_DYNAMITE_INACTIVE,
+ EL_DYNAMITE_ACTIVE,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_MAMPFER,
- EL_KAEFER_O,
- EL_FLIEGER_O,
+ EL_KAEFER_UP,
+ EL_FLIEGER_UP,
EL_ROBOT,
- EL_KAEFER_L,
- EL_FLIEGER_L,
- EL_KAEFER_R,
- EL_FLIEGER_R,
+ EL_KAEFER_LEFT,
+ EL_FLIEGER_LEFT,
+ EL_KAEFER_RIGHT,
+ EL_FLIEGER_RIGHT,
EL_ABLENK_AUS,
- EL_KAEFER_U,
- EL_FLIEGER_U,
+ EL_KAEFER_DOWN,
+ EL_FLIEGER_DOWN,
EL_UNSICHTBAR,
EL_BADEWANNE1,
EL_AMOEBE_NASS,
EL_AMOEBE_NORM,
+ EL_EM_KEY_1_FILE,
+ EL_EM_KEY_2_FILE,
+ EL_EM_KEY_3_FILE,
+ EL_EM_KEY_4_FILE,
+
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+
+ EL_CHAR('M'),
+ EL_CHAR('O'),
+ EL_CHAR('R'),
+ EL_CHAR('E'),
+
EL_SCHLUESSEL1,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
EL_PFORTE3X,
EL_PFORTE4X,
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
-
- EL_PFEIL_L,
- EL_PFEIL_R,
- EL_PFEIL_O,
- EL_PFEIL_U,
+ EL_PFEIL_LEFT,
+ EL_PFEIL_RIGHT,
+ EL_PFEIL_UP,
+ EL_PFEIL_DOWN,
EL_AMOEBE_VOLL,
EL_EDELSTEIN_GELB,
EL_ERZ_EDEL_LILA,
EL_LIFE,
- EL_PACMAN_O,
+ EL_PACMAN_UP,
EL_ZEIT_VOLL,
EL_ZEIT_LEER,
- EL_PACMAN_L,
+ EL_PACMAN_LEFT,
EL_MAMPFER2,
- EL_PACMAN_R,
+ EL_PACMAN_RIGHT,
EL_MAUER_LEBT,
EL_LIFE_ASYNC,
- EL_PACMAN_U,
+ EL_PACMAN_DOWN,
EL_BIRNE_AUS,
EL_BIRNE_EIN,
EL_DYNABOMB_XL,
EL_BADEWANNE,
- EL_MAULWURF,
+ EL_MOLE,
EL_PINGUIN,
EL_SCHWEIN,
EL_DRACHE,
+ EL_LEERRAUM,
+ EL_MOLE_UP,
+ EL_LEERRAUM,
+ EL_LEERRAUM,
+
+ EL_MOLE_LEFT,
+ EL_LEERRAUM,
+ EL_MOLE_RIGHT,
+ EL_LEERRAUM,
+
+ EL_LEERRAUM,
+ EL_MOLE_DOWN,
+ EL_BALLOON,
+ EL_BALLOON_SEND_ANY,
+
+ EL_BALLOON_SEND_LEFT,
+ EL_BALLOON_SEND_RIGHT,
+ EL_BALLOON_SEND_UP,
+ EL_BALLOON_SEND_DOWN,
+
EL_SONDE,
EL_MAUER_X,
EL_MAUER_Y,
EL_SPEED_PILL,
EL_BLACK_ORB,
- EL_CHAR_A + ('S' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('K' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
- EL_CHAR_MINUS,
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
+
+
+ EL_CHAR('S'),
+ EL_CHAR('O'),
+ EL_CHAR('K'),
+ EL_CHAR('O'),
+
+ EL_CHAR('-'),
+ EL_CHAR('B'),
+ EL_CHAR('A'),
+ EL_CHAR('N'),
EL_SOKOBAN_OBJEKT,
EL_SOKOBAN_FELD_LEER,
EL_SOKOBAN_FELD_VOLL,
EL_BETON,
- EL_LEERRAUM,
- EL_LEERRAUM,
- EL_LEERRAUM,
- EL_LEERRAUM,
-
EL_CHAR('S'),
EL_CHAR('U'),
EL_CHAR('P'),
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
+ EL_CHAR('D'),
+ EL_CHAR('I'),
+ EL_CHAR('A'),
+ EL_CHAR('-'),
+
+ EL_CHAR('M'),
+ EL_CHAR('O'),
+ EL_CHAR('N'),
+ EL_CHAR('D'),
+
+ EL_CHAR('C'),
+ EL_CHAR('A'),
+ EL_CHAR('V'),
+ EL_CHAR('E'),
+
+ EL_CHAR('S'),
+ EL_CHAR(' '),
+ EL_CHAR('I'),
+ EL_CHAR('I'),
+
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_WALL_PEARL,
+ EL_WALL_CRYSTAL,
+
+ EL_BELT1_LEFT,
+ EL_BELT1_MIDDLE,
+ EL_BELT1_RIGHT,
+ EL_BELT1_SWITCH_MIDDLE,
+
+ EL_BELT2_LEFT,
+ EL_BELT2_MIDDLE,
+ EL_BELT2_RIGHT,
+ EL_BELT2_SWITCH_MIDDLE,
+
+ EL_BELT3_LEFT,
+ EL_BELT3_MIDDLE,
+ EL_BELT3_RIGHT,
+ EL_BELT3_SWITCH_MIDDLE,
+
+ EL_BELT4_LEFT,
+ EL_BELT4_MIDDLE,
+ EL_BELT4_RIGHT,
+ EL_BELT4_SWITCH_MIDDLE,
+
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT4_SWITCH_LEFT,
+
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_RIGHT,
+
+ EL_SWITCHGATE_OPEN,
+ EL_SWITCHGATE_CLOSED,
+ EL_SWITCHGATE_SWITCH_1,
+ EL_ENVELOPE,
+
+ EL_TIMEGATE_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_SWITCH_OFF,
+ EL_LEERRAUM,
+
+ EL_LANDMINE,
+ EL_SAND_INVISIBLE,
+ EL_STEEL_SLANTED,
+ EL_LEERRAUM,
+
+ EL_SIGN_EXCLAMATION,
+ EL_SIGN_STOP,
+ EL_LIGHT_SWITCH_OFF,
+ EL_LIGHT_SWITCH_ON,
+
+ EL_SHIELD_PASSIVE,
+ EL_SHIELD_ACTIVE,
+ EL_EXTRA_TIME,
+ EL_LEERRAUM,
+
+ EL_CHAR('D'),
+ EL_CHAR('X'),
+ EL_CHAR('-'),
+ EL_CHAR(' '),
+
+ EL_CHAR('B'),
+ EL_CHAR('O'),
+ EL_CHAR('U'),
+ EL_CHAR('L'),
+
+ EL_CHAR('-'),
+ EL_CHAR('D'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
+
+ EL_CHAR('D'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
+ EL_CHAR('H'),
+
+ EL_SPRING,
+ EL_TUBE_RIGHT_DOWN,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_DOWN,
+
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERT_LEFT,
+
+ EL_TUBE_VERTICAL,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_LEFT_UP,
+
+ EL_TRAP_INACTIVE,
+ EL_DX_SUPABOMB,
+ EL_LEERRAUM,
+ EL_LEERRAUM,
+
/*
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('Y' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
+ EL_CHAR('D'),
+ EL_CHAR('Y'),
+ EL_CHAR('N'),
+ EL_CHAR('A'),
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('S' - 'A'),
+ EL_CHAR('B'),
+ EL_CHAR('L'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
EL_CHAR_MINUS,
- EL_CHAR_A + ('T' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
+ EL_CHAR('T'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
*/
EL_LEERRAUM,
};
int elements_in_list = sizeof(editor_element)/sizeof(int);
+static char *getElementInfoText(int element)
+{
+ char *info_text = "unknown";
+
+ if (element < num_element_info)
+ info_text = element_info[element];
+ else
+ Error(ERR_WARN, "no element description for element %d", element);
+
+ return info_text;
+}
+
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);
- 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));
+ BlitBitmap(drawto, drawto,
+ 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 : ed_fieldx - 1);
static void CreateControlButtons()
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
unsigned long event_mask;
int i;
gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, control_info[i].text,
GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_RADIO_NR, radio_button_nr,
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,
- GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y1,
+ GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y2,
+ GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- if (id == GADGET_ID_ELEMENTLIST_UP ||
- id == GADGET_ID_ELEMENTLIST_DOWN)
+ if (id == GADGET_ID_SCROLL_LIST_UP ||
+ id == GADGET_ID_SCROLL_LIST_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;
+ width = ED_SCROLLBUTTON2_XSIZE;
+ height = ED_SCROLLBUTTON2_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON2_XSIZE;
+ gd_y2 = gd_y1;
}
else
{
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_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
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_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
/* create buttons for element list */
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
{
- Pixmap deco_pixmap;
+ Bitmap *deco_bitmap;
int deco_x, deco_y, deco_xpos, deco_ypos;
int gd_xoffset, gd_yoffset;
- int gd_x, gd_y1, gd_y2;
+ int gd_x1, gd_x2, gd_y;
int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
int id = GADGET_ID_ELEMENTLIST_FIRST + i;
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;
+ gd_x1 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS + ED_ELEMENTLIST_XSIZE;
+ gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
getMiniGraphicSource(el2gfx(editor_element[i]),
- &deco_pixmap, &deco_x, &deco_y);
+ &deco_bitmap, &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, element_info[editor_element[i]],
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_INFO_TEXT, getElementInfoText(editor_element[i]),
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_x, gd_y1,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
- GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+ GDI_DECORATION_DESIGN, deco_bitmap, 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_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
for (j=0; j<2; j++)
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
int id = (j == 0 ?
counterbutton_info[i].gadget_id_down :
counterbutton_info[i].gadget_id_up);
int gd_xoffset;
int gd_x, gd_x1, gd_x2, gd_y;
+ int x_size, y_size;
unsigned long event_mask;
char infotext[MAX_INFOTEXT_LEN + 1];
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
- gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
- gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
- gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+ if (i == ED_COUNTER_ID_SELECT_LEVEL)
+ {
+ int sid = (j == 0 ?
+ ED_SCROLLBUTTON_ID_AREA_LEFT :
+ ED_SCROLLBUTTON_ID_AREA_RIGHT);
+
+ event_mask |= GD_EVENT_RELEASED;
+
+ if (j == 1)
+ xpos += 2 * ED_GADGET_DISTANCE;
+ ypos += ED_GADGET_DISTANCE;
+
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].xpos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[sid].ypos;
+ x_size = ED_SCROLLBUTTON_XSIZE;
+ y_size = ED_SCROLLBUTTON_YSIZE;
+ }
+ else
+ {
+ gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
+ gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
+ gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
+ gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+ x_size = ED_BUTTON_COUNT_XSIZE;
+ y_size = ED_BUTTON_COUNT_YSIZE;
+ }
sprintf(infotext, "%s counter value by 1, 5 or 10",
(j == 0 ? "decrease" : "increase"));
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, infotext,
GDI_X, xpos,
GDI_Y, ypos,
- GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
- GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
+ GDI_WIDTH, x_size,
+ GDI_HEIGHT, y_size,
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_bitmap, gd_x1, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleCounterButtons,
GDI_END);
if (j == 0)
{
+ int font_type = FC_YELLOW;
+ int gd_width = ED_WIN_COUNT_XSIZE;
+
id = counterbutton_info[i].gadget_id_text;
event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
- gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+ if (i == ED_COUNTER_ID_SELECT_LEVEL)
+ {
+ font_type = FC_SPECIAL3;
+
+ xpos += 2 * ED_GADGET_DISTANCE;
+ ypos -= ED_GADGET_DISTANCE;
+
+ gd_x = DOOR_GFX_PAGEX6 + ED_WIN_COUNT2_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT2_YPOS;
+ gd_width = ED_WIN_COUNT2_XSIZE;
+ }
+ else
+ {
+ gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+ }
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, "enter counter value",
GDI_X, xpos,
GDI_Y, ypos,
GDI_NUMBER_MIN, counterbutton_info[i].min_value,
GDI_NUMBER_MAX, counterbutton_info[i].max_value,
GDI_TEXT_SIZE, 3,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_TEXT_FONT, font_type,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
+ GDI_TEXTINPUT_DESIGN_WIDTH, gd_width,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleCounterButtons,
GDI_END);
level_editor_gadget[id] = gi;
/* ... up to eight areas for element content ... */
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
{
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 = GADGET_ID_ELEM_CONTENT_0 + i;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_X, gx,
GDI_Y, gy,
GDI_WIDTH, 3 * MINI_TILEX,
for (i=0; i<ED_NUM_TEXTINPUT; i++)
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = pix[PIX_DOOR];
int gd_x, gd_y;
struct GadgetInfo *gi;
unsigned long event_mask;
infotext[MAX_INFOTEXT_LEN] = '\0';
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, infotext,
GDI_X, SX + textinput_info[i].x,
GDI_Y, SY + textinput_info[i].y,
GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
GDI_TEXT_VALUE, textinput_info[i].value,
GDI_TEXT_SIZE, textinput_info[i].size,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_TEXT_FONT, FC_YELLOW,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
+ GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleTextInputGadgets,
GDI_END);
for (i=0; i<ED_NUM_SCROLLBARS; i++)
{
int id = scrollbar_info[i].gadget_id;
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = 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)
+ if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
{
- items_max = MAX(lev_fieldx + 2, ed_fieldx);
- items_visible = ed_fieldx;
+ items_max = elements_in_list / ED_ELEMENTLIST_BUTTONS_HORIZ;
+ items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
item_position = 0;
}
- else
+ else /* drawing area scrollbars */
{
- items_max = MAX(lev_fieldy + 2, ed_fieldy);
- items_visible = ed_fieldy;
- item_position = 0;
+ if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+ {
+ 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;
+ 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_x2 = (gd_x1 - (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL ?
+ scrollbar_info[i].height : scrollbar_info[i].width));
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_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, scrollbar_info[i].infotext,
- GDI_X, SX + scrollbar_info[i].x,
- GDI_Y, SY + scrollbar_info[i].y,
+ GDI_X, scrollbar_info[i].x,
+ GDI_Y, 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_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, ED_BORDER_SIZE,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
static void CreateCheckbuttonGadgets()
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
unsigned long event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
gd_x2 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_UNCHECKED_XPOS;
gd_x3 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_CHECKED_XPOS;
gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS;
for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
{
(*radiobutton_info[i].value == radiobutton_info[i].checked_value);
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, radiobutton_info[i].infotext,
GDI_X, SX + radiobutton_info[i].x,
GDI_Y, SY + radiobutton_info[i].y,
GDI_TYPE, GD_TYPE_RADIO_BUTTON,
GDI_RADIO_NR, radiobutton_info[i].radio_button_nr,
GDI_CHECKED, checked,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
- GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
- GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+ GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
+ GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+ GDI_CALLBACK_ACTION, HandleRadiobuttons,
GDI_END);
if (gi == NULL)
gd_y = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, checkbutton_info[i].infotext,
GDI_X, SX + checkbutton_info[i].x,
GDI_Y, SY + checkbutton_info[i].y,
GDI_HEIGHT, ED_CHECKBUTTON_YSIZE,
GDI_TYPE, GD_TYPE_CHECK_BUTTON,
GDI_CHECKED, *checkbutton_info[i].value,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
- GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
- GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+ GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
+ GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+ GDI_CALLBACK_ACTION, HandleCheckbuttons,
GDI_END);
if (gi == NULL)
CreateCheckbuttonGadgets();
}
+static void MapCounterButtons(int id)
+{
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+}
+
static void MapControlButtons()
{
+ int counter_id;
int i;
+ /* map toolbox buttons */
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
MapGadget(level_editor_gadget[i]);
+
+ /* map buttons to select elements */
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
-}
-
-static void MapCounterButtons(int id)
-{
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+
+ /* map buttons to select level */
+ counter_id = ED_COUNTER_ID_SELECT_LEVEL;
+ ModifyEditorCounterLimits(counter_id,
+ leveldir_current->first_level,
+ leveldir_current->last_level);
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
}
static void MapDrawingArea(int id)
boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
int i;
- for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+ for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i<=ED_SCROLLBUTTON_ID_AREA_LAST; i++)
{
if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
i == ED_SCROLLBUTTON_ID_AREA_RIGHT) &&
MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
}
- for (i=0; i<ED_NUM_SCROLLBARS; i++)
+ for (i=ED_SCROLLBAR_ID_AREA_FIRST; i<=ED_SCROLLBAR_ID_AREA_LAST; i++)
{
- if ((i == ED_SCROLLBAR_ID_HORIZONTAL && no_horizontal_scrollbar) ||
- (i == ED_SCROLLBAR_ID_VERTICAL && no_vertical_scrollbar))
+ if ((i == ED_SCROLLBAR_ID_AREA_HORIZONTAL && no_horizontal_scrollbar) ||
+ (i == ED_SCROLLBAR_ID_AREA_VERTICAL && no_vertical_scrollbar))
continue;
MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
int i;
for (i=0; i<NUM_EDITOR_GADGETS; i++)
- if (level_editor_gadget[i]->x < DX)
+ if (level_editor_gadget[i]->x < SX + SXSIZE)
UnmapGadget(level_editor_gadget[i]);
}
UnmapGadget(level_editor_gadget[i]);
}
-void DrawLevelEd()
+static void ResetUndoBuffer()
+{
+ undo_buffer_position = -1;
+ undo_buffer_steps = -1;
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
+
+static void DrawEditModeWindow()
{
- int i, x, y, graphic;
+ if (edit_mode == ED_MODE_INFO)
+ DrawLevelInfoWindow();
+ else if (edit_mode == ED_MODE_PROPERTIES)
+ DrawPropertiesWindow();
+ else /* edit_mode == ED_MODE_DRAWING */
+ DrawDrawingWindow();
+}
- edit_mode = ED_MODE_DRAWING;
+static boolean LevelChanged()
+{
+ boolean level_changed = FALSE;
+ int x, y;
- CloseDoor(DOOR_CLOSE_ALL);
+ for(y=0; y<lev_fieldy; y++)
+ for(x=0; x<lev_fieldx; x++)
+ if (Feld[x][y] != Ur[x][y])
+ level_changed = TRUE;
+
+ return level_changed;
+}
+
+static boolean LevelContainsPlayer()
+{
+ boolean player_found = FALSE;
+ int x, y;
+
+ 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)
+ player_found = TRUE;
+ return player_found;
+}
+
+void DrawLevelEd()
+{
+ CloseDoor(DOOR_CLOSE_ALL);
OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
if (level_editor_test_game)
{
+ int x, y;
+
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
Feld[x][y] = Ur[x][y];
}
else
{
+ edit_mode = ED_MODE_DRAWING;
+
+ ResetUndoBuffer();
level_xpos = -1;
level_ypos = -1;
- undo_buffer_position = -1;
- undo_buffer_steps = -1;
- CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
- /*
- DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- FadeToFront();
- */
+ /* copy default editor door content to main double buffer */
+ BlitBitmap(pix[PIX_DOOR], drawto,
+ DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
- DXSIZE,DYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6+ED_BUTTON_ELEM_XPOS,
- DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS,
- 4*ED_BUTTON_ELEM_XSIZE,5*ED_BUTTON_ELEM_YSIZE,
- DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS,
- DOOR_GFX_PAGEY1+ED_BUTTON_EUP_Y2POS);
-
- for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
- {
- if (i < elements_in_list)
- graphic = el2gfx(editor_element[i + element_shift]);
- else
- graphic = GFX_LEERRAUM;
-
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 +
- (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
- DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
- (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
- graphic);
- }
-
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
+ /* draw mouse button brush elements */
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
el2gfx(new_element1));
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
el2gfx(new_element2));
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
el2gfx(new_element3));
- DrawTextExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- int2str(level_nr,2),FS_SMALL,FC_SPECIAL1);
- XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+3,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- 7,FONT3_YSIZE,
- DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
- XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+14,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- 7,FONT3_YSIZE,
- DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS+9,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_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);
/* draw bigger door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 0,
- 108, 64,
- EX - 4, EY - 12);
+ DrawSpecialEditorDoor();
/* draw new control window */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX8, 236,
- EXSIZE, EYSIZE,
- EX, EY);
+ BlitBitmap(pix[PIX_DOOR], drawto,
+ DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
redraw_mask |= REDRAW_ALL;
- OpenDoor(DOOR_OPEN_1);
+ MapControlButtons();
- strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
+ /* copy actual editor door content to door double buffer for OpenDoor() */
+ BlitBitmap(drawto, pix[PIX_DB_DOOR],
+ DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
- MapControlButtons();
+ DrawEditModeWindow();
/*
- MapMainDrawingArea();
+ FadeToFront();
*/
- DrawDrawingWindow();
- FadeToFront();
+
+ OpenDoor(DOOR_OPEN_1);
/*
OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
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_ID_HORIZONTAL].width + xoffset;
- height = scrollbar_info[ED_SCROLLBAR_ID_VERTICAL].height + yoffset;
+ width = scrollbar_info[ED_SCROLLBAR_ID_AREA_HORIZONTAL].width + xoffset;
+ height = scrollbar_info[ED_SCROLLBAR_ID_AREA_VERTICAL].height + yoffset;
ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
GDI_WIDTH, width,
static void ModifyEditorCounter(int counter_id, int new_value)
{
- int *counter_value = *counterbutton_info[counter_id].counter_value;
+ int *counter_value = counterbutton_info[counter_id].value;
int gadget_id = counterbutton_info[counter_id].gadget_id_text;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
*counter_value = gi->text.number_value;
}
+static void ModifyEditorCounterLimits(int counter_id, int min, int max)
+{
+ int gadget_id = counterbutton_info[counter_id].gadget_id_text;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+
+ ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END);
+}
+
static void PickDrawingElement(int button, int element)
{
if (button < 1 || button > 3)
if (button == 1)
{
new_element1 = element;
- DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_LEFT_XPOS,
- DY + ED_WIN_MB_LEFT_YPOS,
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
el2gfx(new_element1));
}
else if (button == 2)
{
new_element2 = element;
- DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_MIDDLE_XPOS,
- DY + ED_WIN_MB_MIDDLE_YPOS,
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
el2gfx(new_element2));
}
else
{
new_element3 = element;
- DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_RIGHT_XPOS,
- DY + ED_WIN_MB_RIGHT_YPOS,
+ DrawMiniGraphicExt(drawto,
+ DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
el2gfx(new_element3));
}
for (x=0; x<2; x++)
DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
- XFillRectangle(display, drawto, gc,
+ ClearRectangle(drawto,
area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
MINI_TILEX + 2, MINI_TILEY + 2);
/* copy border to the right location */
- XCopyArea(display, drawto, drawto, gc,
- area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
- area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+ BlitBitmap(drawto, drawto,
+ area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
+ area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
"Editor Settings", FS_BIG, FC_YELLOW);
- gadget_level_xsize_value = &lev_fieldx;
- gadget_level_ysize_value = &lev_fieldy;
- gadget_level_random_value = &random_placement_value;
- gadget_level_collect_value = &level.edelsteine;
- gadget_level_timelimit_value = &level.time;
- gadget_level_timescore_value = &level.score[10];
-
/* draw counter gadgets */
for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
{
DrawTextF(x, y, font_color, infotext);
}
- ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
+ ModifyEditorCounter(i, *counterbutton_info[i].value);
MapCounterButtons(i);
}
int font_color = FC_GREEN;
int x, y;
- ElementContent[0][0][0] = level.amoebe_inhalt;
+ ElementContent[0][0][0] = level.amoeba_content;
/* draw decorative border for the object */
for (y=0; y<2; y++)
for (x=0; x<2; x++)
DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
- XFillRectangle(display, drawto, gc,
+ ClearRectangle(drawto,
area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
MINI_TILEX + 2, MINI_TILEY + 2);
/* copy border to the right location */
- XCopyArea(display, drawto, drawto, gc,
- area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
- area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+ BlitBitmap(drawto, drawto,
+ area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
+ area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba",
FS_SMALL, font_color);
static void DrawElementContentAreas()
{
- int *num_areas = &MampferMax;
+ int counter_id = ED_COUNTER_ID_ELEM_CONTENT;
int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
int font_color = FC_GREEN;
int i, x, y;
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
for (y=0; y<3; y++)
for (x=0; x<3; x++)
- ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
+ ElementContent[i][x][y] = level.yam_content[i][x][y];
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
/* display counter to choose number of element content areas */
- gadget_elem_content_value = num_areas;
-
- x = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].x + xoffset_right;
- y = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].y + yoffset_right;
+ x = counterbutton_info[counter_id].x + xoffset_right;
+ y = counterbutton_info[counter_id].y + yoffset_right;
DrawTextF(x, y, font_color, "number of content areas");
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, *gadget_elem_content_value);
- MapCounterButtons(ED_COUNTER_ID_ELEM_CONTENT);
+
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
/* delete content areas in case of reducing number of them */
- XFillRectangle(display, backbuffer, gc,
+ ClearRectangle(backbuffer,
SX, area_sy - MINI_TILEX,
SXSIZE, 12 * MINI_TILEY);
/* draw some decorative border for the objects */
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
{
for (y=0; y<4; y++)
for (x=0; x<4; x++)
DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
EL_ERDREICH);
- XFillRectangle(display, drawto, gc,
+ ClearRectangle(drawto,
area_sx + 5 * (i % 4) * MINI_TILEX + MINI_TILEX/2 - 1,
area_sy + 6 * (i / 4) * MINI_TILEY + MINI_TILEY/2 - 1,
3 * MINI_TILEX + 2, 3 * MINI_TILEY + 2);
}
/* copy border to the right location */
- XCopyArea(display, drawto, drawto, gc,
- area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 11 * MINI_TILEY,
- area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+ BlitBitmap(drawto, drawto,
+ area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 11 * MINI_TILEY,
+ area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
"Content", FS_SMALL, font_color);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
"smashed", FS_SMALL, font_color);
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
{
for (y=0; y<3; y++)
for (x=0; x<3; x++)
font_color, "%d", i + 1);
}
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
}
static void DrawPropertiesWindow()
{
+ int counter_id = ED_COUNTER_ID_ELEM_SCORE;
int num_elements_in_level;
float percentage;
int xoffset_right = counter_xsize;
static struct
{
int element;
- int *counter_value;
+ int *value;
char *text;
} elements_with_counter[] =
{
- { EL_EDELSTEIN, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_BD, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_GELB,&level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_ROT, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_LILA,&level.score[0], TEXT_COLLECTING },
- { EL_DIAMANT, &level.score[1], TEXT_COLLECTING },
- { EL_KAEFER_R, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_O, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_L, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_U, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_R, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_O, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_L, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_U, &level.score[2], TEXT_SMASHING },
- { EL_FLIEGER_R, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_O, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_L, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_U, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_R, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_O, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_L, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_U, &level.score[3], TEXT_SMASHING },
- { EL_MAMPFER, &level.score[4], TEXT_SMASHING },
- { EL_MAMPFER2, &level.score[4], TEXT_SMASHING },
- { EL_ROBOT, &level.score[5], TEXT_SMASHING },
- { EL_PACMAN_R, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_O, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_L, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_U, &level.score[6], TEXT_SMASHING },
- { EL_KOKOSNUSS, &level.score[7], TEXT_CRACKING },
- { EL_DYNAMIT_AUS, &level.score[8], TEXT_COLLECTING },
- { EL_SCHLUESSEL1, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL2, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL3, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL4, &level.score[9], TEXT_COLLECTING },
- { EL_AMOEBE_NASS, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_NORM, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_VOLL, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_BD, &level.tempo_amoebe, TEXT_SPEED },
- { EL_SIEB_INAKTIV, &level.dauer_sieb, TEXT_DURATION },
- { EL_ABLENK_AUS, &level.dauer_ablenk, TEXT_DURATION },
+ { EL_EDELSTEIN, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_BD, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_GELB,&level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_ROT, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_LILA,&level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_DIAMANT, &level.score[SC_DIAMANT], TEXT_COLLECTING },
+ { EL_KAEFER_RIGHT, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_UP, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_LEFT, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_DOWN, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_UP, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_FLIEGER_RIGHT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_UP, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_LEFT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_DOWN, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_RIGHT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_UP, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_LEFT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_DOWN, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_MAMPFER, &level.score[SC_MAMPFER], TEXT_SMASHING },
+ { EL_MAMPFER2, &level.score[SC_MAMPFER], TEXT_SMASHING },
+ { EL_ROBOT, &level.score[SC_ROBOT], TEXT_SMASHING },
+ { EL_PACMAN_RIGHT, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_UP, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_LEFT, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_KOKOSNUSS, &level.score[SC_KOKOSNUSS], TEXT_CRACKING },
+ { EL_DYNAMITE_INACTIVE,&level.score[SC_DYNAMIT], TEXT_COLLECTING },
+ { EL_SCHLUESSEL1, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL2, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL3, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL4, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_1_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_2_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_3_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_4_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_AMOEBE_NASS, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_NORM, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_VOLL, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_BD, &level.amoeba_speed, TEXT_SPEED },
+ { EL_MAGIC_WALL_OFF,&level.time_magic_wall, TEXT_DURATION },
+ { EL_ABLENK_AUS, &level.time_wheel, TEXT_DURATION },
{ -1, NULL, NULL }
};
for (x=0; x<3; x++)
DrawMiniElement(xstart + x , ystart + y, EL_ERDREICH);
- XFillRectangle(display, drawto, gc,
+ ClearRectangle(drawto,
SX + xstart * MINI_TILEX + MINI_TILEX/2 - 1,
SY + ystart * MINI_TILEY + MINI_TILEY/2 - 1,
TILEX + 2, TILEY + 2);
/* copy border to the right location */
- XCopyArea(display, drawto, drawto, gc,
- SX + xstart * MINI_TILEX,
- SY + ystart * MINI_TILEY,
- 2 * TILEX, 2 * TILEY,
- SX + xstart * MINI_TILEX - MINI_TILEX/2,
- SY + ystart * MINI_TILEY - MINI_TILEY/2);
+ BlitBitmap(drawto, drawto,
+ SX + xstart * MINI_TILEX,
+ SY + ystart * MINI_TILEY,
+ 2 * TILEX, 2 * TILEY,
+ SX + xstart * MINI_TILEX - MINI_TILEX/2,
+ SY + ystart * MINI_TILEY - MINI_TILEY/2);
DrawGraphic(xstart/2, ystart/2, el2gfx(properties_element));
/* copy the whole stuff to the definitive location */
- XCopyArea(display, drawto, drawto, gc,
- SX + xstart * MINI_TILEX - MINI_TILEX/2,
- SY + ystart * MINI_TILEY - MINI_TILEY,
- 2 * TILEX, 2 * TILEY,
- SX + xstart * MINI_TILEX - MINI_TILEX/2,
- SY + ystart * MINI_TILEY - MINI_TILEY/2);
+ BlitBitmap(drawto, drawto,
+ SX + xstart * MINI_TILEX - MINI_TILEX/2,
+ SY + ystart * MINI_TILEY - MINI_TILEY,
+ 2 * TILEX, 2 * TILEY,
+ SX + xstart * MINI_TILEX - MINI_TILEX/2,
+ SY + ystart * MINI_TILEY - MINI_TILEY/2);
DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
- font_color, element_info[properties_element]);
+ font_color, getElementInfoText(properties_element));
num_elements_in_level = 0;
for (y=0; y<lev_fieldy; y++)
{
if (elements_with_counter[i].element == properties_element)
{
- int x = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].x + xoffset_right;
- int y = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].y + yoffset_right;
-
- gadget_elem_score_value = elements_with_counter[i].counter_value;
+ int x = counterbutton_info[counter_id].x + xoffset_right;
+ int y = counterbutton_info[counter_id].y + yoffset_right;
+ counterbutton_info[counter_id].value = elements_with_counter[i].value;
DrawTextF(x, y, font_color, elements_with_counter[i].text);
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, *gadget_elem_score_value);
- MapCounterButtons(ED_COUNTER_ID_ELEM_SCORE);
+
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
break;
}
}
if (HAS_CONTENT(properties_element))
{
-
-#if 1
/* draw stickybutton gadget */
i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
x = checkbutton_info[i].x + xoffset_right2;
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
-#endif
-
if (IS_AMOEBOID(properties_element))
DrawAmoebaContentArea();
else
DrawElementContentAreas();
}
-}
-static void swap_numbers(int *i1, int *i2)
-{
- int help = *i1;
-
- *i1 = *i2;
- *i2 = help;
-}
-
-static void swap_number_pairs(int *x1, int *y1, int *x2, int *y2)
-{
- int help_x = *x1;
- int help_y = *y1;
-
- *x1 = *x2;
- *x2 = help_x;
+ if (IS_GEM(properties_element))
+ {
+ /* draw checkbutton gadget */
+ i = ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS;
+ x = checkbutton_info[i].x + xoffset_right2;
+ y = checkbutton_info[i].y + yoffset_right2;
- *y1 = *y2;
- *y2 = help_y;
+ DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+ GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+ MapCheckbuttonGadget(i);
+ }
}
static void DrawLineElement(int sx, int sy, int element, boolean change_level)
to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1;
to_sy = SY + to_y * MINI_TILEY + MINI_TILEY - 1;
- XSetForeground(display, gc, WhitePixel(display, screen));
-
- XDrawLine(display, drawto, gc, from_sx, from_sy, to_sx, from_sy);
- XDrawLine(display, drawto, gc, to_sx, from_sy, to_sx, to_sy);
- XDrawLine(display, drawto, gc, to_sx, to_sy, from_sx, to_sy);
- XDrawLine(display, drawto, gc, from_sx, to_sy, from_sx, from_sy);
-
- XSetForeground(display, gc, BlackPixel(display, screen));
+ DrawSimpleWhiteLine(drawto, from_sx, from_sy, to_sx, from_sy);
+ DrawSimpleWhiteLine(drawto, to_sx, from_sy, to_sx, to_sy);
+ DrawSimpleWhiteLine(drawto, to_sx, to_sy, from_sx, to_sy);
+ DrawSimpleWhiteLine(drawto, from_sx, to_sy, from_sx, from_sy);
if (from_x == to_x && from_y == to_y)
MarkTileDirty(from_x/2, from_y/2);
static int brush_width, brush_height;
static int last_cursor_x = -1, last_cursor_y = -1;
static boolean delete_old_brush;
- int new_element;
+ int new_element = BUTTON_ELEMENT(button);
int x, y;
if (mode == CB_DELETE_OLD_CURSOR && !delete_old_brush)
return;
- new_element = (button == 1 ? new_element1 :
- button == 2 ? new_element2 :
- button == 3 ? new_element3 : 0);
-
if (mode == CB_AREA_TO_BRUSH)
{
int from_lx, from_ly;
}
}
- /*
- 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;
}
/* values for DrawLevelText() modes */
-#define TEXT_INIT 0
-#define TEXT_SETCURSOR 1
-#define TEXT_WRITECHAR 2
-#define TEXT_BACKSPACE 3
-#define TEXT_NEWLINE 4
-#define TEXT_END 5
-
-static void DrawLevelText(int sx, int sy, char letter, int mode)
+#define TEXT_INIT 0
+#define TEXT_SETCURSOR 1
+#define TEXT_WRITECHAR 2
+#define TEXT_BACKSPACE 3
+#define TEXT_NEWLINE 4
+#define TEXT_END 5
+#define TEXT_QUERY_TYPING 6
+
+static int DrawLevelText(int sx, int sy, char letter, int mode)
{
static short delete_buffer[MAX_LEV_FIELDX];
static int start_sx, start_sy;
static int last_sx, last_sy;
static boolean typing = FALSE;
int letter_element = EL_CHAR_ASCII0 + letter;
- int lx, ly;
+ int lx = 0, ly = 0;
/* map lower case letters to upper case and convert special characters */
if (letter >= 'a' && letter <= 'z')
if (mode != TEXT_INIT)
{
if (!typing)
- return;
+ return FALSE;
if (mode != TEXT_SETCURSOR)
{
if (sx > start_sx)
{
Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
- DrawMiniElement(sx - 1, sy, new_element3);
+ DrawMiniElement(sx - 1, sy, Feld[lx - 1][ly]);
DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR);
}
break;
typing = FALSE;
break;
+ case TEXT_QUERY_TYPING:
+ break;
+
default:
break;
}
+
+ return typing;
}
static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy,
for(y=0; y<lev_fieldy; y++)
UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
- /* check if change of border style was forced by drawing operation */
+ /* check if drawing operation forces change of border style */
last_border_element = BorderElement;
SetBorderElement();
if (BorderElement != last_border_element)
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 lx = 0, ly = 0;
int min_lx = 0, min_ly = 0;
int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
int x, y;
/* handle info callback for each invocation of action callback */
gi->callback_info(gi);
- /*
- if (edit_mode != ED_MODE_DRAWING)
- return;
- */
-
button_press_event = (gi->event.type == GD_EVENT_PRESSED);
button_release_event = (gi->event.type == GD_EVENT_RELEASED);
if (!button && !button_release_event)
return;
-
-#if 0
- if (button_release_event)
- button = 0;
-#endif
-
-#if 0
- if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
- return;
-#endif
-
/* automatically switch to 'single item' drawing mode, if needed */
actual_drawing_function =
(draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
}
else
{
- DrawMiniGraphicExt(drawto, gc,
+ DrawMiniGraphicExt(drawto,
gi->x + sx * MINI_TILEX,
gi->y + sy * MINI_TILEY,
el2gfx(new_element));
- DrawMiniGraphicExt(window, gc,
+ DrawMiniGraphicExt(window,
gi->x + sx * MINI_TILEX,
gi->y + sy * MINI_TILEY,
el2gfx(new_element));
if (id == GADGET_ID_AMOEBA_CONTENT)
- level.amoebe_inhalt = new_element;
+ level.amoeba_content = new_element;
else if (id == GADGET_ID_RANDOM_BACKGROUND)
random_placement_background_element = new_element;
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] =
+ level.yam_content[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
new_element;
}
break;
{
CopyAreaToBrush(start_sx, start_sy, sx, sy, button);
CopyBrushToCursor(sx, sy);
- ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],MB_LEFT);
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],
+ MB_LEFTBUTTON);
draw_with_brush = TRUE;
}
else if (drawing_function == GADGET_ID_TEXT)
break;
case GADGET_ID_PICK_ELEMENT:
-
- /*
- if (button_press_event)
- PickDrawingElement(button, Feld[lx][ly]);
- */
-
if (button_release_event)
- ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
+ ClickOnGadget(level_editor_gadget[last_drawing_function],
+ MB_LEFTBUTTON);
else
PickDrawingElement(button, Feld[lx][ly]);
static void HandleCounterButtons(struct GadgetInfo *gi)
{
- int id = gi->custom_id;
+ int gadget_id = gi->custom_id;
+ int counter_id = gi->custom_type_id;
int button = gi->event.button;
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int *counter_value = counterbutton_info[counter_id].value;
+ int step = BUTTON_STEPSIZE(button) *
+ (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1);
- switch (id)
+ if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
{
- 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 GADGET_ID_ELEM_SCORE_TEXT:
- *gadget_elem_score_value = gi->text.number_value;
- break;
+ boolean pressed = (gi->event.type == GD_EVENT_PRESSED);
+ boolean released = (gi->event.type == GD_EVENT_RELEASED);
+ boolean level_changed = LevelChanged();
- 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 GADGET_ID_ELEM_CONTENT_TEXT:
- *gadget_elem_content_value = gi->text.number_value;
- DrawElementContentAreas();
- break;
-
- 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 GADGET_ID_LEVEL_XSIZE_TEXT:
- *gadget_level_xsize_value = gi->text.number_value;
- level.fieldx = lev_fieldx;
- break;
+ if ((level_changed && pressed) || (!level_changed && released))
+ return;
- 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 GADGET_ID_LEVEL_YSIZE_TEXT:
- *gadget_level_ysize_value = gi->text.number_value;
- level.fieldy = lev_fieldy;
- break;
+ if (level_changed && !Request("Level has changed! Discard changes ?",
+ REQ_ASK))
+ {
+ if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+ ModifyEditorCounter(counter_id, *counter_value);
+ return;
+ }
+ }
- 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 GADGET_ID_LEVEL_RANDOM_TEXT:
- *gadget_level_random_value = gi->text.number_value;
- break;
+ if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+ *counter_value = gi->text.number_value;
+ else
+ ModifyEditorCounter(counter_id, *counter_value + step);
- 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 GADGET_ID_LEVEL_COLLECT_TEXT:
- *gadget_level_collect_value = gi->text.number_value;
+ switch (counter_id)
+ {
+ case ED_COUNTER_ID_ELEM_CONTENT:
+ DrawElementContentAreas();
break;
- 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 GADGET_ID_LEVEL_TIMELIMIT_TEXT:
- *gadget_level_timelimit_value = gi->text.number_value;
+ case ED_COUNTER_ID_LEVEL_XSIZE:
+ case ED_COUNTER_ID_LEVEL_YSIZE:
+ lev_fieldx = level.fieldx;
+ lev_fieldy = level.fieldy;
break;
- 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 GADGET_ID_LEVEL_TIMESCORE_TEXT:
- *gadget_level_timescore_value = gi->text.number_value;
+ case ED_COUNTER_ID_SELECT_LEVEL:
+ LoadLevel(level_nr);
+ ResetUndoBuffer();
+ DrawEditModeWindow();
break;
default:
static void HandleTextInputGadgets(struct GadgetInfo *gi)
{
- int id = gi->custom_id;
-
- switch (id)
- {
- case GADGET_ID_LEVEL_NAME:
- strcpy(level.name, gi->text.value);
- break;
+ strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+}
- case GADGET_ID_LEVEL_AUTHOR:
- strcpy(level.author, gi->text.value);
- break;
+static void HandleRadiobuttons(struct GadgetInfo *gi)
+{
+ *radiobutton_info[gi->custom_type_id].value =
+ radiobutton_info[gi->custom_type_id].checked_value;
+}
- default:
- break;
- }
+static void HandleCheckbuttons(struct GadgetInfo *gi)
+{
+ *checkbutton_info[gi->custom_type_id].value ^= TRUE;
}
static void HandleControlButtons(struct GadgetInfo *gi)
{
int id = gi->custom_id;
int button = gi->event.button;
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int step = BUTTON_STEPSIZE(button);
int new_element = BUTTON_ELEMENT(button);
- int player_present = FALSE;
- int level_changed = FALSE;
int i, x, y;
if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
case GADGET_ID_SCROLL_LEFT:
if (level_xpos >= 0)
{
- int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldx < ed_fieldx - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_RIGHT:
if (level_xpos <= lev_fieldx - ed_fieldx)
{
- int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldx < ed_fieldx - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_UP:
if (level_ypos >= 0)
{
- int gadget_id = GADGET_ID_SCROLL_VERTICAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldy < ed_fieldy - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_DOWN:
if (level_ypos <= lev_fieldy - ed_fieldy)
{
- int gadget_id = GADGET_ID_SCROLL_VERTICAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldy < ed_fieldy - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
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;
+ case GADGET_ID_SCROLL_LIST_UP:
+ case GADGET_ID_SCROLL_LIST_DOWN:
+ case GADGET_ID_SCROLL_LIST_VERTICAL:
+ if (id == GADGET_ID_SCROLL_LIST_VERTICAL)
+ element_shift = gi->event.item_position * ED_ELEMENTLIST_BUTTONS_HORIZ;
+ else
+ {
+ step *= (id == GADGET_ID_SCROLL_LIST_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;
+ 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;
+
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION,
+ element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+ }
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
{
int element = editor_element[element_shift + i];
UnmapGadget(gi);
- getMiniGraphicSource(el2gfx(element), &gd->pixmap, &gd->x, &gd->y);
- ModifyGadget(gi, GDI_INFO_TEXT, element_info[element], GDI_END);
+ getMiniGraphicSource(el2gfx(element), &gd->bitmap, &gd->x, &gd->y);
+ ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
MapGadget(gi);
}
break;
break;
case GADGET_ID_SAVE:
- if (leveldir[leveldir_nr].readonly)
+ if (leveldir_current->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] != Ur[x][y])
- level_changed = TRUE;
-
- if (0 && !level_changed)
- {
- Request("Level has not changed !", 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)
- player_present = TRUE;
-
- if (!player_present)
+ if (!LevelContainsPlayer)
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
else
{
break;
case GADGET_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 ||
- Feld[x][y] == EL_SP_MURPHY)
- player_present = TRUE;
-
- if (!player_present)
+ if (!LevelContainsPlayer)
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
else
{
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;
+ UndrawSpecialEditorDoor();
CloseDoor(DOOR_CLOSE_ALL);
break;
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])
- level_changed = TRUE;
-
- if (!level_changed ||
- Request("Level has changed! Exit without saving ?",
- REQ_ASK | REQ_STAY_OPEN))
- {
- CloseDoor(DOOR_CLOSE_1);
-
- /*
- CloseDoor(DOOR_CLOSE_ALL);
- */
-
- /* draw smaller door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 64,
- 108, 64,
- EX - 4, EY - 12);
- redraw_mask |= REDRAW_ALL;
-
- game_status = MAINMENU;
- DrawMainMenu();
- }
- else
- {
- CloseDoor(DOOR_CLOSE_1);
- XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
- DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
- OpenDoor(DOOR_OPEN_1);
- }
- break;
-
- case GADGET_ID_RANDOM_PERCENTAGE:
- *radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].value =
- radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].checked_value;
- break;
-
- case GADGET_ID_RANDOM_QUANTITY:
- *radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].value =
- radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].checked_value;
- break;
-
- case GADGET_ID_RANDOM_RESTRICTED:
- *checkbutton_info[ED_CHECKBUTTON_ID_RANDOM_RESTRICTED].value ^= TRUE;
- break;
-
- case GADGET_ID_DOUBLE_SPEED:
- *checkbutton_info[ED_CHECKBUTTON_ID_DOUBLE_SPEED].value ^= TRUE;
- break;
-
- case GADGET_ID_STICK_ELEMENT:
- *checkbutton_info[ED_CHECKBUTTON_ID_STICK_ELEMENT].value ^= TRUE;
+ RequestExitLevelEditor(TRUE); /* if level has changed, ask user */
break;
default:
}
if (drawing_function == GADGET_ID_PICK_ELEMENT)
- ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
+ ClickOnGadget(level_editor_gadget[last_drawing_function],
+ MB_LEFTBUTTON);
}
#ifdef DEBUG
else if (gi->event.type == GD_EVENT_PRESSED)
}
}
-void HandleLevelEditorKeyInput(KeySym key)
+void HandleLevelEditorKeyInput(Key key)
{
- char letter = getCharFromKeySym(key);
- int button = MB_LEFT;
+ char letter = getCharFromKey(key);
+ int button = MB_LEFTBUTTON;
- if (drawing_function == GADGET_ID_TEXT)
+ if (drawing_function == GADGET_ID_TEXT &&
+ DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE)
{
if (letter)
DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
- else if (key == XK_Delete || key == XK_BackSpace)
+ else if (key == KSYM_Delete || key == KSYM_BackSpace)
DrawLevelText(0, 0, 0, TEXT_BACKSPACE);
- else if (key == XK_Return)
+ else if (key == KSYM_Return)
DrawLevelText(0, 0, 0, TEXT_NEWLINE);
+ else if (key == KSYM_Escape)
+ DrawLevelText(0, 0, 0, TEXT_END);
}
else if (button_status == MB_RELEASED)
{
- int i, id;
+ int i, id = GADGET_ID_NONE;
switch (key)
{
- case XK_Left:
+ case KSYM_Left:
id = GADGET_ID_SCROLL_LEFT;
break;
- case XK_Right:
+ case KSYM_Right:
id = GADGET_ID_SCROLL_RIGHT;
break;
- case XK_Up:
+ case KSYM_Up:
id = GADGET_ID_SCROLL_UP;
break;
- case XK_Down:
+ case KSYM_Down:
id = GADGET_ID_SCROLL_DOWN;
break;
- case XK_Page_Up:
- id = GADGET_ID_ELEMENTLIST_UP;
- button = 3;
+ case KSYM_Page_Up:
+ id = GADGET_ID_SCROLL_LIST_UP;
+ button = MB_RIGHTBUTTON;
break;
- case XK_Page_Down:
- id = GADGET_ID_ELEMENTLIST_DOWN;
- button = 3;
+ case KSYM_Page_Down:
+ id = GADGET_ID_SCROLL_LIST_DOWN;
+ button = MB_RIGHTBUTTON;
break;
+ case KSYM_Escape:
+ if (edit_mode == ED_MODE_DRAWING)
+ {
+ RequestExitLevelEditor(setup.ask_on_escape);
+ }
+ else
+ {
+ DrawDrawingWindow();
+ edit_mode = ED_MODE_DRAWING;
+ }
+ break;
+
default:
- id = GADGET_ID_NONE;
break;
}
ClickOnGadget(level_editor_gadget[id], button);
else if (letter == '.')
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+ else if (key == KSYM_Return || key == setup.shortcut.toggle_pause)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
else
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
if (letter && letter == control_info[i].shortcut)
void ClearEditorGadgetInfoText()
{
- XFillRectangle(display, drawto, gc,
+ ClearRectangle(drawto,
INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
redraw_mask |= REDRAW_FIELD;
}
{
struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
char infotext[MAX_INFOTEXT_LEN + 1];
- char shortcut[20];
+ char shortcut[MAX_INFOTEXT_LEN + 1];
+
+ if (game_status != LEVELED)
+ return;
ClearEditorGadgetInfoText();
+ if (gi->event.type == GD_EVENT_INFO_LEAVING)
+ return;
+
/* misuse this function to delete brush cursor, if needed */
if (edit_mode == ED_MODE_DRAWING && draw_with_brush)
DeleteBrushFromCursor();
if (key)
{
- sprintf(shortcut, " ('%s%c')",
- (key >= 'A' && key <= 'Z' ? "Shift-" :
- gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""),
- key);
+ if (gi->custom_id == GADGET_ID_SINGLE_ITEMS) /* special case 1 */
+ sprintf(shortcut, " ('.' or '%c')", key);
+ else if (gi->custom_id == GADGET_ID_TEST) /* special case 2 */
+ sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
+ else /* normal case */
+ sprintf(shortcut, " ('%s%c')",
+ (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
strcat(infotext, shortcut);
ClearEditorGadgetInfoText();
+ if (gi->event.type == GD_EVENT_INFO_LEAVING)
+ return;
+
/* 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);
}
else if (drawing_function == GADGET_ID_PICK_ELEMENT)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
- "%s", element_info[Feld[lx][ly]]);
+ "%s", getElementInfoText(Feld[lx][ly]));
else
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Level position: %d, %d", lx, ly);
"Content area %d position: %d, %d",
id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
}
+
+void RequestExitLevelEditor(boolean ask_if_level_has_changed)
+{
+ if (!ask_if_level_has_changed ||
+ !LevelChanged() ||
+ Request("Level has changed! Exit without saving ?",
+ REQ_ASK | REQ_STAY_OPEN))
+ {
+ CloseDoor(DOOR_CLOSE_1);
+ /*
+ CloseDoor(DOOR_CLOSE_ALL);
+ */
+ game_status = MAINMENU;
+ DrawMainMenu();
+ }
+ else
+ {
+ CloseDoor(DOOR_CLOSE_1);
+ BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+ DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
+ DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+ OpenDoor(DOOR_OPEN_1);
+ }
+}