int gadget_id_align;
int *value;
int area_xsize, area_ysize;
- char *text_left, *text_right, *text_below, *infotext;
+ char *text_left, *text_right, *text_above, *text_below, *infotext;
} drawingarea_info[ED_NUM_DRAWING_AREAS] =
{
// ---------- level playfield content ---------------------------------------
GADGET_ID_DRAWING_LEVEL, GADGET_ID_NONE,
NULL,
-1, -1, // these values are not constant, but can change at runtime
- NULL, NULL, NULL, NULL
+ NULL, NULL, NULL, NULL, NULL
},
// ---------- yam yam content -----------------------------------------------
ED_AREA_YAMYAM_CONTENT_XOFF(0), ED_AREA_YAMYAM_CONTENT_YOFF(0),
GADGET_ID_YAMYAM_CONTENT_0, GADGET_ID_NONE,
&level.yamyam_content[0].e[0][0], 3, 3,
- NULL, NULL, "1", NULL
+ NULL, NULL, NULL, "1", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(1), ED_AREA_YAMYAM_CONTENT_YOFF(1),
GADGET_ID_YAMYAM_CONTENT_1, GADGET_ID_NONE,
&level.yamyam_content[1].e[0][0], 3, 3,
- NULL, NULL, "2", NULL
+ NULL, NULL, NULL, "2", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(2), ED_AREA_YAMYAM_CONTENT_YOFF(2),
GADGET_ID_YAMYAM_CONTENT_2, GADGET_ID_NONE,
&level.yamyam_content[2].e[0][0], 3, 3,
- NULL, NULL, "3", NULL
+ NULL, NULL, NULL, "3", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(3), ED_AREA_YAMYAM_CONTENT_YOFF(3),
GADGET_ID_YAMYAM_CONTENT_3, GADGET_ID_NONE,
&level.yamyam_content[3].e[0][0], 3, 3,
- NULL, NULL, "4", NULL
+ NULL, NULL, NULL, "4", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(4), ED_AREA_YAMYAM_CONTENT_YOFF(4),
GADGET_ID_YAMYAM_CONTENT_4, GADGET_ID_NONE,
&level.yamyam_content[4].e[0][0], 3, 3,
- NULL, NULL, "5", NULL
+ NULL, NULL, NULL, "5", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(5), ED_AREA_YAMYAM_CONTENT_YOFF(5),
GADGET_ID_YAMYAM_CONTENT_5, GADGET_ID_NONE,
&level.yamyam_content[5].e[0][0], 3, 3,
- NULL, NULL, "6", NULL
+ NULL, NULL, NULL, "6", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(6), ED_AREA_YAMYAM_CONTENT_YOFF(6),
GADGET_ID_YAMYAM_CONTENT_6, GADGET_ID_NONE,
&level.yamyam_content[6].e[0][0], 3, 3,
- NULL, NULL, "7", NULL
+ NULL, NULL, NULL, "7", NULL
},
{
ED_AREA_YAMYAM_CONTENT_XPOS, ED_AREA_YAMYAM_CONTENT_YPOS,
ED_AREA_YAMYAM_CONTENT_XOFF(7), ED_AREA_YAMYAM_CONTENT_YOFF(7),
GADGET_ID_YAMYAM_CONTENT_7, GADGET_ID_NONE,
&level.yamyam_content[7].e[0][0], 3, 3,
- NULL, NULL, "8", NULL
+ NULL, NULL, NULL, "8", NULL
},
// ---------- magic ball content --------------------------------------------
ED_AREA_MAGIC_BALL_CONTENT_XOFF(0), ED_AREA_MAGIC_BALL_CONTENT_YOFF(0),
GADGET_ID_MAGIC_BALL_CONTENT_0, GADGET_ID_NONE,
&level.ball_content[0].e[0][0], 3, 3,
- NULL, NULL, "1", NULL
+ NULL, NULL, NULL, "1", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(1), ED_AREA_MAGIC_BALL_CONTENT_YOFF(1),
GADGET_ID_MAGIC_BALL_CONTENT_1, GADGET_ID_NONE,
&level.ball_content[1].e[0][0], 3, 3,
- NULL, NULL, "2", NULL
+ NULL, NULL, NULL, "2", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(2), ED_AREA_MAGIC_BALL_CONTENT_YOFF(2),
GADGET_ID_MAGIC_BALL_CONTENT_2, GADGET_ID_NONE,
&level.ball_content[2].e[0][0], 3, 3,
- NULL, NULL, "3", NULL
+ NULL, NULL, NULL, "3", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(3), ED_AREA_MAGIC_BALL_CONTENT_YOFF(3),
GADGET_ID_MAGIC_BALL_CONTENT_3, GADGET_ID_NONE,
&level.ball_content[3].e[0][0], 3, 3,
- NULL, NULL, "4", NULL
+ NULL, NULL, NULL, "4", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(4), ED_AREA_MAGIC_BALL_CONTENT_YOFF(4),
GADGET_ID_MAGIC_BALL_CONTENT_4, GADGET_ID_NONE,
&level.ball_content[4].e[0][0], 3, 3,
- NULL, NULL, "5", NULL
+ NULL, NULL, NULL, "5", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(5), ED_AREA_MAGIC_BALL_CONTENT_YOFF(5),
GADGET_ID_MAGIC_BALL_CONTENT_5, GADGET_ID_NONE,
&level.ball_content[5].e[0][0], 3, 3,
- NULL, NULL, "6", NULL
+ NULL, NULL, NULL, "6", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(6), ED_AREA_MAGIC_BALL_CONTENT_YOFF(6),
GADGET_ID_MAGIC_BALL_CONTENT_6, GADGET_ID_NONE,
&level.ball_content[6].e[0][0], 3, 3,
- NULL, NULL, "7", NULL
+ NULL, NULL, NULL, "7", NULL
},
{
ED_AREA_MAGIC_BALL_CONTENT_XPOS, ED_AREA_MAGIC_BALL_CONTENT_YPOS,
ED_AREA_MAGIC_BALL_CONTENT_XOFF(7), ED_AREA_MAGIC_BALL_CONTENT_YOFF(7),
GADGET_ID_MAGIC_BALL_CONTENT_7, GADGET_ID_NONE,
&level.ball_content[7].e[0][0], 3, 3,
- NULL, NULL, "8", NULL
+ NULL, NULL, NULL, "8", NULL
},
// ---------- android content -----------------------------------------------
ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_ANDROID_CONTENT, GADGET_ID_NONE,
&level.android_clone_element[0], MAX_ANDROID_ELEMENTS, 1,
- "elements:", NULL, NULL, "elements android can clone"
+ "elements:", NULL, NULL, NULL, "elements android can clone"
},
// ---------- amoeba content ------------------------------------------------
ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_AMOEBA_CONTENT, GADGET_ID_NONE,
&level.amoeba_content, 1, 1,
- "content:", NULL, NULL, "amoeba content"
+ "content:", NULL, NULL, NULL, "amoeba content"
},
// ---------- level start element -------------------------------------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_START_ELEMENT, GADGET_ID_USE_START_ELEMENT,
&level.start_element[0], 1, 1,
- NULL, NULL, NULL, "level start element"
+ NULL, NULL, NULL, NULL, "level start element"
},
// ---------- player artwork element ----------------------------------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_ARTWORK_ELEMENT, GADGET_ID_USE_ARTWORK_ELEMENT,
&level.artwork_element[0], 1, 1,
- NULL, NULL, NULL, "element for player artwork"
+ NULL, NULL, NULL, NULL, "element for player artwork"
},
// ---------- player explosion element --------------------------------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_EXPLOSION_ELEMENT, GADGET_ID_USE_EXPLOSION_ELEMENT,
&level.explosion_element[0], 1, 1,
- NULL, NULL, NULL, "element for player explosion"
+ NULL, NULL, NULL, NULL, "element for player explosion"
},
// ---------- player initial inventory --------------------------------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_INVENTORY_CONTENT, GADGET_ID_USE_INITIAL_INVENTORY,
&level.initial_inventory_content[0][0], MAX_INITIAL_INVENTORY_SIZE, 1,
- NULL, NULL, NULL, "content for initial inventory"
+ NULL, NULL, NULL, NULL, "content for initial inventory"
},
// ---------- element settings: configure 1 (custom elements) ---------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_GRAPHIC, GADGET_ID_CUSTOM_USE_GRAPHIC,
&custom_element.gfx_element_initial,1, 1,
- NULL, NULL, NULL, "custom graphic element"
+ NULL, NULL, NULL, NULL, "custom graphic element"
},
// ---------- element settings: configure 2 (custom elements) ---------------
0, ED_AREA_3X3_SETTINGS_YOFF,
GADGET_ID_CUSTOM_CONTENT, GADGET_ID_NONE, // align three rows
&custom_element.content.e[0][0], 3, 3,
- "content:", NULL, NULL, NULL
+ "content:", NULL, NULL, NULL, NULL
},
// ---------- custom enter and leave element (when moving) ------------------
ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_MOVE_ENTER, GADGET_ID_NONE,
&custom_element.move_enter_element, 1, 1,
- "can dig:", " ", NULL, "element that can be digged/collected"
+ "can dig:", " ", NULL, NULL, "element that can be digged/collected"
},
{
-1, ED_AREA_1X1_SETTINGS_YPOS(3),
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_MOVE_LEAVE, GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE,
&custom_element.move_leave_element, 1, 1,
- NULL, NULL, NULL, "element that will be left behind"
+ NULL, NULL, NULL, NULL, "element that will be left behind"
},
// ---------- element settings: advanced (custom elements) ------------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_CHANGE_TARGET, GADGET_ID_CUSTOM_CAN_CHANGE,
&custom_element_change.target_element, 1, 1,
- NULL, "after/when:", NULL, "new target element after change"
+ NULL, "after/when:", NULL, NULL, "new target element after change"
},
// ---------- custom change content (extended change target) ----------------
0, ED_AREA_3X3_SETTINGS_YOFF,
GADGET_ID_CUSTOM_CHANGE_CONTENT, GADGET_ID_NONE, // align three rows
&custom_element_change.target_content.e[0][0], 3, 3,
- NULL, NULL, NULL, "new extended elements after change"
+ NULL, NULL, NULL, NULL, "new extended elements after change"
},
// ---------- custom change trigger (element causing change) ----------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_CHANGE_TRIGGER, GADGET_ID_CHANGE_OTHER_ACTION,
&custom_element_change.initial_trigger_element, 1, 1,
- NULL, NULL, NULL, "other element triggering change"
+ NULL, NULL, NULL, NULL, "other element triggering change"
},
// ---------- custom change action (element used for action) ----------------
0, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_CUSTOM_CHANGE_ACTION, GADGET_ID_ACTION_ARG,
&custom_element_change.action_element, 1, 1,
- NULL, NULL, NULL, "element used as action parameter"
+ NULL, NULL, NULL, NULL, "element used as action parameter"
},
// ---------- group element content -----------------------------------------
ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF,
GADGET_ID_GROUP_CONTENT, GADGET_ID_NONE,
&group_element_info.element[0], MAX_ELEMENTS_IN_GROUP, 1,
- "content:", NULL, NULL, NULL
+ "content:", NULL, NULL, NULL, NULL
},
// ---------- random background (for random painting) -----------------------
0, ED_AREA_1X1_LSETTINGS_YOFF,
GADGET_ID_RANDOM_BACKGROUND, GADGET_ID_RANDOM_RESTRICTED,
&random_placement_background_element, 1, 1,
- NULL, NULL, NULL, "random placement background"
+ NULL, NULL, NULL, NULL, "random placement background"
},
};
int xoffset_below = getTextWidth(drawingarea_info[id].text_below, font_nr);
int x_left = gi->x - xoffset_left;
int x_right = gi->x + gi->width + ED_DRAWINGAREA_TEXT_DISTANCE;
+ int x_above = gi->x - ED_DRAWINGAREA_BORDER_SIZE;
int x_below = gi->x + (gi->width - xoffset_below) / 2;
int y_side = gi->y + (gi->height - font_height) / 2;
+ int y_above = gi->y - font_height - ED_DRAWINGAREA_TEXT_DISTANCE;
int y_below = gi->y + gi->height + ED_DRAWINGAREA_TEXT_DISTANCE;
if (drawingarea_info[id].text_left)
if (drawingarea_info[id].text_right)
DrawText(x_right, y_side, drawingarea_info[id].text_right, font_nr);
+ if (drawingarea_info[id].text_above)
+ DrawText(x_above, y_above, drawingarea_info[id].text_above, font_nr);
+
if (drawingarea_info[id].text_below)
DrawText(x_below, y_below, drawingarea_info[id].text_below, font_nr);
leveldir_current =
getTreeInfoFromIdentifier(leveldir_first, getLoginName());
+ // this may happen if "setup.internal.create_user_levelset" is FALSE
+ // or if file "levelinfo.conf" is missing in personal user level set
+ if (leveldir_current == NULL)
+ {
+ Request("Cannot find personal level set?!", REQ_CONFIRM);
+
+ leveldir_current = leveldir_former;
+
+ return FALSE;
+ }
+
// find unused level number
for (new_level_nr = leveldir_current->first_level; ; new_level_nr++)
{
// copy change events also to special level editor variable
custom_element = element_info[element];
custom_element_change = *element_info[element].change;
+
+ // needed here to restore runtime value "element_info[element].gfx_element"
+ InitElementPropertiesGfxElement();
}
static void CopyGroupElementPropertiesToGame(int element)
element_info[element] = custom_element;
*element_info[element].group = group_element_info;
+
+ // needed here to restore runtime value "element_info[element].gfx_element"
+ InitElementPropertiesGfxElement();
}
static void CopyClassicElementPropertiesToGame(int element)
CopyBrushExt(0, 0, 0, 0, 0, CB_BRUSH_TO_CLIPBOARD_SMALL);
}
+void UndoLevelEditorOperation(void)
+{
+ ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], -1);
+}
+
+void RedoLevelEditorOperation(void)
+{
+ ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+}
+
static void FloodFill(int from_x, int from_y, int fill_element)
{
FloodFillLevel(from_x, from_y, fill_element, Feld, lev_fieldx, lev_fieldy);
break;
case GADGET_ID_UNDO:
- if (button == 1 && GetKeyModState() & (KMOD_Shift|KMOD_Control))
+ if (button < 0) // keep button value (even if modifier keys are pressed)
+ button = -button;
+ else if (button == 1 && GetKeyModState() & (KMOD_Shift | KMOD_Control))
button = 3;
if (button == 1 && undo_buffer_steps == 0)
void HandleLevelEditorKeyInput(Key key)
{
char letter = getCharFromKey(key);
- int button = MB_LEFTBUTTON;
if (drawing_function == GADGET_ID_TEXT &&
DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE)
DrawLevelText(0, 0, 0, TEXT_NEWLINE);
else if (key == KSYM_Escape)
DrawLevelText(0, 0, 0, TEXT_END);
+
+ return;
}
- else
- {
- int id = GADGET_ID_NONE;
- int new_element_shift = element_shift;
- int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
- int i;
- switch (key)
- {
- case KSYM_Left:
- id = GADGET_ID_SCROLL_LEFT;
- break;
- case KSYM_Right:
- id = GADGET_ID_SCROLL_RIGHT;
- break;
- case KSYM_Up:
- id = GADGET_ID_SCROLL_UP;
- break;
- case KSYM_Down:
- id = GADGET_ID_SCROLL_DOWN;
- break;
+ int id = GADGET_ID_NONE;
+ int new_element_shift = element_shift;
+ int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
+ int button = MB_LEFTBUTTON;
+ int i;
- case KSYM_Page_Up:
- case KSYM_Page_Down:
- step *= (key == KSYM_Page_Up ? -1 : +1);
- element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+ switch (key)
+ {
+ case KSYM_Left:
+ id = GADGET_ID_SCROLL_LEFT;
+ break;
+ case KSYM_Right:
+ id = GADGET_ID_SCROLL_RIGHT;
+ break;
+ case KSYM_Up:
+ id = GADGET_ID_SCROLL_UP;
+ break;
+ case KSYM_Down:
+ id = GADGET_ID_SCROLL_DOWN;
+ break;
- if (element_shift < 0)
- element_shift = 0;
- if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
- element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+ case KSYM_Page_Up:
+ case KSYM_Page_Down:
+ step *= (key == KSYM_Page_Up ? -1 : +1);
+ element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
- ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
- GDI_SCROLLBAR_ITEM_POSITION,
- element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+ if (element_shift < 0)
+ element_shift = 0;
+ if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+ element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
- ModifyEditorElementList();
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION,
+ element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
- break;
+ ModifyEditorElementList();
- case KSYM_Home:
- case KSYM_End:
- element_shift = (key == KSYM_Home ? 0 :
- num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
+ break;
- ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
- GDI_SCROLLBAR_ITEM_POSITION,
- element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+ case KSYM_Home:
+ case KSYM_End:
+ element_shift = (key == KSYM_Home ? 0 :
+ num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
- ModifyEditorElementList();
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION,
+ element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
- break;
+ ModifyEditorElementList();
- case KSYM_Insert:
- case KSYM_Delete:
+ break;
- // this is needed to prevent interference with running "True X-Mouse"
- if (GetKeyModStateFromEvents() & KMOD_Control)
- break;
+ case KSYM_Insert:
+ case KSYM_Delete:
- // check for last or next editor cascade block in element list
- for (i = 0; i < num_editor_elements; i++)
- {
- if ((key == KSYM_Insert && i == element_shift) ||
- (key == KSYM_Delete && new_element_shift > element_shift))
- break;
+ // this is needed to prevent interference with running "True X-Mouse"
+ if (GetKeyModStateFromEvents() & KMOD_Control)
+ break;
- // jump to next cascade block (or to start of element list)
- if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
- new_element_shift = i;
- }
+ // check for last or next editor cascade block in element list
+ for (i = 0; i < num_editor_elements; i++)
+ {
+ if ((key == KSYM_Insert && i == element_shift) ||
+ (key == KSYM_Delete && new_element_shift > element_shift))
+ break;
- if (i < num_editor_elements)
- element_shift = new_element_shift;
+ // jump to next cascade block (or to start of element list)
+ if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
+ new_element_shift = i;
+ }
- if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
- element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+ if (i < num_editor_elements)
+ element_shift = new_element_shift;
- ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
- GDI_SCROLLBAR_ITEM_POSITION,
- element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+ if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+ element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
- ModifyEditorElementList();
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION,
+ element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
- break;
+ ModifyEditorElementList();
- case KSYM_Escape:
- if (edit_mode == ED_MODE_DRAWING)
- {
- RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
- }
- else if (edit_mode == ED_MODE_INFO)
- {
- HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
- }
- else if (edit_mode == ED_MODE_PROPERTIES)
- {
- HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
- }
- else if (edit_mode == ED_MODE_PALETTE)
- {
- HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
- }
- else // should never happen
- {
- ChangeEditModeWindow(ED_MODE_DRAWING);
- }
+ break;
- break;
+ case KSYM_Escape:
+ if (edit_mode == ED_MODE_DRAWING)
+ RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
+ else if (edit_mode == ED_MODE_INFO)
+ HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
+ else if (edit_mode == ED_MODE_PROPERTIES)
+ HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
+ else if (edit_mode == ED_MODE_PALETTE)
+ HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
+ else // should never happen
+ ChangeEditModeWindow(ED_MODE_DRAWING);
- default:
- break;
- }
+ break;
- if (id != GADGET_ID_NONE)
- ClickOnGadget(level_editor_gadget[id], button);
- else if (letter == '1' || letter == '?')
- ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
- else if (letter == '2')
- ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
- else if (letter == '3')
- ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
- else if (letter == '.')
- ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
- else if (letter == 'U')
- ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
- else if (letter == '-' || key == KSYM_KP_Subtract)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
- else if (letter == '0' || key == KSYM_KP_0)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
- else if (letter == '+' || key == KSYM_KP_Add ||
- letter == '=') // ("Shift-=" is "+" on US keyboards)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
- else if (key == KSYM_Return ||
- key == KSYM_space ||
- 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 == controlbutton_info[i].shortcut)
- if (!anyTextGadgetActive())
- ClickOnGadget(level_editor_gadget[i], button);
+ default:
+ break;
}
+
+ if (id != GADGET_ID_NONE)
+ ClickOnGadget(level_editor_gadget[id], button);
+ else if (letter == '1' || letter == '?')
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
+ else if (letter == '2')
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
+ else if (letter == '3')
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
+ else if (letter == '.')
+ ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+ else if (letter == 'U')
+ ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+ else if (letter == '-' || key == KSYM_KP_Subtract)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
+ else if (letter == '0' || key == KSYM_KP_0)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
+ else if (letter == '+' || key == KSYM_KP_Add ||
+ letter == '=') // ("Shift-=" is "+" on US keyboards)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
+ else if (key == KSYM_Return ||
+ key == KSYM_space ||
+ 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 == controlbutton_info[i].shortcut)
+ if (!anyTextGadgetActive())
+ ClickOnGadget(level_editor_gadget[i], button);
}
void HandleLevelEditorIdle(void)
projects / rocksndiamonds.git / blobdiff