X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=89e8d438d85b3e7947b1eb3930b46f7fc9865f50;hb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c;hp=f3feeba7a337ef8e694b44349ad54082791df791;hpb=5b0dc92b2f5aba6cebec2c334728a4d17a3d75df;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index f3feeba7..89e8d438 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1,23 +1,23 @@ /*********************************************************** -* 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-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* editor.c * +* editor.c * ***********************************************************/ #include +#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" @@ -690,10 +690,10 @@ 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_STEPSIZE(button) (button == 1 ? 1 : button == 2 ? 5 : 10) +#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); @@ -751,15 +751,15 @@ int editor_element[] = 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_UP, EL_FIREFLY_UP, - EL_FELSBROCKEN, + EL_BD_ROCK, EL_BUTTERFLY_LEFT, EL_FIREFLY_LEFT, @@ -799,7 +799,7 @@ int editor_element[] = EL_BETON, EL_MAUERWERK, EL_FELSBODEN, - EL_SIEB_INAKTIV, + EL_MAGIC_WALL_OFF, EL_EDELSTEIN, EL_DIAMANT, @@ -933,8 +933,13 @@ int editor_element[] = EL_LEERRAUM, EL_MOLE_DOWN, - EL_LEERRAUM, - EL_LEERRAUM, + 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, @@ -946,6 +951,17 @@ int editor_element[] = EL_SPEED_PILL, EL_BLACK_ORB, + EL_EMC_STEEL_WALL_1, + EL_EMC_WALL_1, + EL_EMC_WALL_2, + EL_EMC_WALL_3, + + 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'), @@ -1041,6 +1057,11 @@ int editor_element[] = 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, @@ -1096,6 +1117,46 @@ int editor_element[] = 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('D'), EL_CHAR('Y'), @@ -1200,19 +1261,31 @@ int editor_element[] = }; 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); @@ -1232,7 +1305,7 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll) static void CreateControlButtons() { - Pixmap gd_pixmap = pix[PIX_DOOR]; + Bitmap *gd_bitmap = pix[PIX_DOOR]; struct GadgetInfo *gi; unsigned long event_mask; int i; @@ -1316,11 +1389,12 @@ static void CreateControlButtons() 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); @@ -1375,9 +1449,10 @@ static void CreateControlButtons() 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); @@ -1390,7 +1465,7 @@ static void CreateControlButtons() /* create buttons for element list */ for (i=0; ifirst_level, + leveldir_current->last_level); ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value); MapCounterButtons(counter_id); } @@ -2048,17 +2130,17 @@ void DrawLevelEd() } /* 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); + BlitBitmap(pix[PIX_DOOR], drawto, + DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); /* draw mouse button brush elements */ - DrawMiniGraphicExt(drawto, gc, + DrawMiniGraphicExt(drawto, DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS, el2gfx(new_element1)); - DrawMiniGraphicExt(drawto, gc, + DrawMiniGraphicExt(drawto, DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS, el2gfx(new_element2)); - DrawMiniGraphicExt(drawto, gc, + DrawMiniGraphicExt(drawto, DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS, el2gfx(new_element3)); @@ -2066,18 +2148,16 @@ void DrawLevelEd() 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; MapControlButtons(); /* 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); + BlitBitmap(drawto, pix[PIX_DB_DOOR], + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); DrawEditModeWindow(); @@ -2233,21 +2313,21 @@ static void PickDrawingElement(int button, int element) if (button == 1) { new_element1 = element; - DrawMiniGraphicExt(drawto, gc, + 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, + DrawMiniGraphicExt(drawto, DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS, el2gfx(new_element2)); } else { new_element3 = element; - DrawMiniGraphicExt(drawto, gc, + DrawMiniGraphicExt(drawto, DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS, el2gfx(new_element3)); } @@ -2282,14 +2362,14 @@ static void DrawRandomPlacementBackgroundArea() 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]); @@ -2404,14 +2484,14 @@ static void DrawAmoebaContentArea() 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); @@ -2450,7 +2530,7 @@ static void DrawElementContentAreas() 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); @@ -2462,16 +2542,16 @@ static void DrawElementContentAreas() 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); @@ -2565,7 +2645,7 @@ static void DrawPropertiesWindow() { 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_SIEB_INAKTIV, &level.time_magic_wall, TEXT_DURATION }, + { EL_MAGIC_WALL_OFF,&level.time_magic_wall, TEXT_DURATION }, { EL_ABLENK_AUS, &level.time_wheel, TEXT_DURATION }, { -1, NULL, NULL } }; @@ -2581,31 +2661,31 @@ static void DrawPropertiesWindow() 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; yx + 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)); @@ -3476,7 +3532,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) { 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) @@ -3505,7 +3562,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) case GADGET_ID_PICK_ELEMENT: 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]); @@ -3721,8 +3779,8 @@ static void HandleControlButtons(struct GadgetInfo *gi) 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; @@ -3816,7 +3874,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; case GADGET_ID_SAVE: - if (leveldir[leveldir_nr].readonly) + if (leveldir_current->readonly) { Request("This level is read only !", REQ_CONFIRM); break; @@ -3883,9 +3941,9 @@ static void HandleControlButtons(struct GadgetInfo *gi) 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); + 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); } break; @@ -3908,7 +3966,8 @@ static void HandleControlButtons(struct GadgetInfo *gi) } 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) @@ -3924,19 +3983,19 @@ static void HandleControlButtons(struct GadgetInfo *gi) } } -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 && 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 (button_status == MB_RELEASED) @@ -3945,25 +4004,25 @@ void HandleLevelEditorKeyInput(KeySym key) 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: + case KSYM_Page_Up: id = GADGET_ID_SCROLL_LIST_UP; - button = 3; + button = MB_RIGHTBUTTON; break; - case XK_Page_Down: + case KSYM_Page_Down: id = GADGET_ID_SCROLL_LIST_DOWN; - button = 3; + button = MB_RIGHTBUTTON; break; default: @@ -3975,7 +4034,7 @@ void HandleLevelEditorKeyInput(KeySym key) ClickOnGadget(level_editor_gadget[id], button); else if (letter == '.') ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button); - else if (key == XK_space || key == XK_Return) + else if (key == KSYM_space || key == KSYM_Return) ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button); else for (i=0; i