#define ED_CHECKBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 22)
#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 88)
-#define GADGET_ID_NONE -1
+/* 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
+
+#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_RANDOM_QUANTITY 107
#define GADGET_ID_RANDOM_RESTRICTED 108
#define GADGET_ID_DOUBLE_SPEED 109
-#define GADGET_ID_STICK_ELEMENT 110
+#define GADGET_ID_GRAVITY 110
+#define GADGET_ID_STICK_ELEMENT 111
/* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND 111
+#define GADGET_ID_RANDOM_BACKGROUND 112
-#define NUM_EDITOR_GADGETS 112
+#define NUM_EDITOR_GADGETS 113
/* radio button numbers */
#define RADIO_NR_NONE 0
#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
/* 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_NUM_CHECKBUTTONS 3
+#define ED_NUM_CHECKBUTTONS 4
#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
&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,
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('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_FIREFLY_U,
EL_LEERRAUM,
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
+ EL_CHAR('E'),
+ EL_CHAR('M'),
+ EL_CHAR('E'),
EL_CHAR_MINUS,
- 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_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_INVISIBLE_STEEL,
EL_UNSICHTBAR,
EL_SPEED_PILL,
- EL_LEERRAUM,
+ EL_BLACK_ORB,
- EL_CHAR_A + ('S' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('K' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
+ EL_CHAR('S'),
+ EL_CHAR('O'),
+ EL_CHAR('K'),
+ EL_CHAR('O'),
EL_CHAR_MINUS,
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
+ EL_CHAR('B'),
+ EL_CHAR('A'),
+ EL_CHAR('N'),
EL_SOKOBAN_OBJEKT,
EL_SOKOBAN_FELD_LEER,
EL_SP_CHIP_LOWER,
/*
- 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,
EL_LEERRAUM,
EL_LEERRAUM,
- EL_CHAR_AUSRUF,
- EL_CHAR_ZOLL,
- EL_CHAR_DOLLAR,
- EL_CHAR_PROZ,
+ EL_CHAR(' '),
+ EL_CHAR('!'),
+ EL_CHAR('"'),
+ EL_CHAR('#'),
+
+ EL_CHAR('$'),
+ EL_CHAR('%'),
+ EL_CHAR('&'),
+ EL_CHAR('\''),
+
+ EL_CHAR('('),
+ EL_CHAR(')'),
+ EL_CHAR('*'),
+ EL_CHAR('+'),
+
+ EL_CHAR(','),
+ EL_CHAR('-'),
+ EL_CHAR('.'),
+ EL_CHAR('/'),
+
+ EL_CHAR('0'),
+ EL_CHAR('1'),
+ EL_CHAR('2'),
+ EL_CHAR('3'),
+
+ EL_CHAR('4'),
+ EL_CHAR('5'),
+ EL_CHAR('6'),
+ EL_CHAR('7'),
+
+ EL_CHAR('8'),
+ EL_CHAR('9'),
+ EL_CHAR(':'),
+ EL_CHAR(';'),
+
+ EL_CHAR('<'),
+ EL_CHAR('='),
+ EL_CHAR('>'),
+ EL_CHAR('?'),
+
+ EL_CHAR('@'),
+ EL_CHAR('A'),
+ EL_CHAR('B'),
+ EL_CHAR('C'),
- EL_CHAR_APOSTR,
- EL_CHAR_KLAMM1,
- EL_CHAR_KLAMM2,
- EL_CHAR_PLUS,
+ EL_CHAR('D'),
+ EL_CHAR('E'),
+ EL_CHAR('F'),
+ EL_CHAR('G'),
- EL_CHAR_KOMMA,
- EL_CHAR_MINUS,
- EL_CHAR_PUNKT,
- EL_CHAR_SLASH,
-
- EL_CHAR_0 + 0,
- EL_CHAR_0 + 1,
- EL_CHAR_0 + 2,
- EL_CHAR_0 + 3,
-
- EL_CHAR_0 + 4,
- EL_CHAR_0 + 5,
- EL_CHAR_0 + 6,
- EL_CHAR_0 + 7,
-
- EL_CHAR_0 + 8,
- EL_CHAR_0 + 9,
- EL_CHAR_DOPPEL,
- EL_CHAR_SEMIKL,
-
- EL_CHAR_LT,
- EL_CHAR_GLEICH,
- EL_CHAR_GT,
- EL_CHAR_FRAGE,
-
- EL_CHAR_AT,
- EL_CHAR_A + 0,
- EL_CHAR_A + 1,
- EL_CHAR_A + 2,
-
- EL_CHAR_A + 3,
- EL_CHAR_A + 4,
- EL_CHAR_A + 5,
- EL_CHAR_A + 6,
-
- EL_CHAR_A + 7,
- EL_CHAR_A + 8,
- EL_CHAR_A + 9,
- EL_CHAR_A + 10,
-
- EL_CHAR_A + 11,
- EL_CHAR_A + 12,
- EL_CHAR_A + 13,
- EL_CHAR_A + 14,
-
- EL_CHAR_A + 15,
- EL_CHAR_A + 16,
- EL_CHAR_A + 17,
- EL_CHAR_A + 18,
-
- EL_CHAR_A + 19,
- EL_CHAR_A + 20,
- EL_CHAR_A + 21,
- EL_CHAR_A + 22,
-
- EL_CHAR_A + 23,
- EL_CHAR_A + 24,
- EL_CHAR_A + 25,
- EL_CHAR_AE,
-
- EL_CHAR_OE,
- EL_CHAR_UE,
- EL_CHAR_COPY,
- EL_LEERRAUM
+ EL_CHAR('H'),
+ EL_CHAR('I'),
+ EL_CHAR('J'),
+ EL_CHAR('K'),
+
+ EL_CHAR('L'),
+ EL_CHAR('M'),
+ EL_CHAR('N'),
+ EL_CHAR('O'),
+
+ EL_CHAR('P'),
+ EL_CHAR('Q'),
+ EL_CHAR('R'),
+ EL_CHAR('S'),
+
+ EL_CHAR('T'),
+ EL_CHAR('U'),
+ EL_CHAR('V'),
+ EL_CHAR('W'),
+
+ EL_CHAR('X'),
+ EL_CHAR('Y'),
+ EL_CHAR('Z'),
+ EL_CHAR('Ä'),
+
+ EL_CHAR('Ö'),
+ EL_CHAR('Ü'),
+ EL_CHAR('^'),
+ EL_CHAR(' ')
};
int elements_in_list = sizeof(editor_element)/sizeof(int);
MapGadget(level_editor_gadget[i]);
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
+ MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_UP]);
+ MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_DOWN]);
}
static void MapCounterButtons(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) &&
void DrawLevelEd()
{
- int i, x, y, graphic;
-
edit_mode = ED_MODE_DRAWING;
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];
CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
- /*
- DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- FadeToFront();
- */
-
- 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);
- }
+ /* copy default editor door content to main double buffer */
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
- 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, gc,
+ 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, gc,
+ 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, gc,
+ 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 level number */
+ 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);
+ /* copy level number to fit into level number field */
+ XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 3,
+ DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+ 7, FONT3_YSIZE,
+ DX + ED_WIN_LEVELNR_XPOS,
+ DY + ED_WIN_LEVELNR_YPOS);
+ XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 14,
+ DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+ 7, FONT3_YSIZE,
+ DX + ED_WIN_LEVELNR_XPOS + 9,
+ DY + ED_WIN_LEVELNR_YPOS);
/* draw bigger door */
XCopyArea(display, pix[PIX_DOOR], drawto, gc,
redraw_mask |= REDRAW_ALL;
- OpenDoor(DOOR_OPEN_1);
-
- strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
-
MapControlButtons();
- /*
- MapMainDrawingArea();
- */
+ /* copy actual editor door content to door double buffer for OpenDoor() */
+ XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
+ DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
DrawDrawingWindow();
FadeToFront();
+ OpenDoor(DOOR_OPEN_1);
+
/*
OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
*/
{ EL_SCHLUESSEL2, &level.score[9], TEXT_COLLECTING },
{ EL_SCHLUESSEL3, &level.score[9], TEXT_COLLECTING },
{ EL_SCHLUESSEL4, &level.score[9], TEXT_COLLECTING },
+ { EL_EM_KEY_1_FILE, &level.score[9], TEXT_COLLECTING },
+ { EL_EM_KEY_2_FILE, &level.score[9], TEXT_COLLECTING },
+ { EL_EM_KEY_3_FILE, &level.score[9], TEXT_COLLECTING },
+ { EL_EM_KEY_4_FILE, &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 },
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();
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
+#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 void DrawLevelText(int sx, int sy, char letter, int mode)
+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,
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);
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);
+ else
+ PickDrawingElement(button, Feld[lx][ly]);
+
break;
default:
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 ||
*checkbutton_info[ED_CHECKBUTTON_ID_DOUBLE_SPEED].value ^= TRUE;
break;
+ case GADGET_ID_GRAVITY:
+ *checkbutton_info[ED_CHECKBUTTON_ID_GRAVITY].value ^= TRUE;
+ break;
+
case GADGET_ID_STICK_ELEMENT:
*checkbutton_info[ED_CHECKBUTTON_ID_STICK_ELEMENT].value ^= TRUE;
break;
if (edit_mode == ED_MODE_PROPERTIES)
DrawPropertiesWindow();
}
+
+ if (drawing_function == GADGET_ID_PICK_ELEMENT)
+ ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
}
#ifdef DEBUG
else if (gi->event.type == GD_EVENT_PRESSED)
char letter = getCharFromKeySym(key);
int button = MB_LEFT;
- 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);
break;
}
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
- "%s: %d, %d", infotext,
- ABS(lx - start_lx) + 1,
- ABS(ly - start_ly) + 1);
+ if (drawing_function == GADGET_ID_PICK_ELEMENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+ "%s: %d, %d", infotext, lx, ly);
+ else
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+ "%s: %d, %d", infotext,
+ ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1);
}
+ else if (drawing_function == GADGET_ID_PICK_ELEMENT)
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+ "%s", element_info[Feld[lx][ly]]);
else
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
"Level position: %d, %d", lx, ly);
projects / rocksndiamonds.git / blobdiff