X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=6d38861e69440a665f40b97d49a5a1921991c994;hb=5797b8063d87fc5dfd552b95a46c8c5260da8ea0;hp=1f17252a5b18cdec58d63a9460aa24824f94e8ec;hpb=0f6b2c62e0c72652c8b2093995845e02b91c51d3;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 1f17252a..6d38861e 100644 --- a/src/editor.c +++ b/src/editor.c @@ -99,6 +99,12 @@ #define ED_SETTINGS_LEVEL_TABS_X (editor.settings.tabs.x) #define ED_SETTINGS_LEVEL_TABS_Y (editor.settings.tabs.y) +#define ED_SETTINGS_ENGINE_TABS_X (editor.settings.tabs.x) +#define ED_SETTINGS_ENGINE_TABS_Y (editor.settings.tabs.y + \ + ED_TABBUTTON_YSIZE + \ + ED_GADGET_TINY_DISTANCE + \ + ED_TAB_BAR_HEIGHT + \ + ED_GADGET_TEXT_DISTANCE) #define ED_SETTINGS_ELEMENT_TABS_X (editor.settings.tabs.x) #define ED_SETTINGS_ELEMENT_TABS_Y (editor.settings.tabs.y + \ editor.settings.tabs.yoffset2) @@ -117,6 +123,17 @@ ED_SETTINGS_TABS_YOFFSET + \ getFontHeight(FONT_TEXT_1) + \ ED_GADGET_TEXT_DISTANCE) +#define ED_ENGINE_TABS_XSTART (ED_SETTINGS_ENGINE_TABS_X) +#define ED_ENGINE_TABS_YSTART (ED_SETTINGS_ENGINE_TABS_Y) +#define ED_ENGINE_SETTINGS_XSTART (ED_SETTINGS_ENGINE_TABS_X + \ + ED_SETTINGS_TABS_XOFFSET) +#define ED_ENGINE_SETTINGS_YSTART (ED_SETTINGS_ENGINE_TABS_Y + \ + ED_TABBUTTON_YSIZE + \ + ED_GADGET_TINY_DISTANCE + \ + ED_TAB_BAR_HEIGHT + \ + ED_SETTINGS_TABS_YOFFSET + \ + getFontHeight(FONT_TEXT_1) + \ + ED_GADGET_TEXT_DISTANCE) #define ED_ELEMENT_TABS_XSTART (ED_SETTINGS_ELEMENT_TABS_X) #define ED_ELEMENT_TABS_YSTART (ED_SETTINGS_ELEMENT_TABS_Y) #define ED_ELEMENT_SETTINGS_XSTART (ED_SETTINGS_ELEMENT_TABS_X + \ @@ -137,10 +154,14 @@ #define ED_POS_LEVEL_TABS_LAST (2 * ED_POS_RANGE - 1) #define ED_POS_LEVEL_SETTINGS_FIRST (2 * ED_POS_RANGE) #define ED_POS_LEVEL_SETTINGS_LAST (3 * ED_POS_RANGE - 1) -#define ED_POS_ELEMENT_TABS_FIRST (3 * ED_POS_RANGE) -#define ED_POS_ELEMENT_TABS_LAST (4 * ED_POS_RANGE - 1) -#define ED_POS_ELEMENT_SETTINGS_FIRST (4 * ED_POS_RANGE) -#define ED_POS_ELEMENT_SETTINGS_LAST (5 * ED_POS_RANGE - 1) +#define ED_POS_ENGINE_TABS_FIRST (3 * ED_POS_RANGE) +#define ED_POS_ENGINE_TABS_LAST (4 * ED_POS_RANGE - 1) +#define ED_POS_ENGINE_SETTINGS_FIRST (4 * ED_POS_RANGE) +#define ED_POS_ENGINE_SETTINGS_LAST (5 * ED_POS_RANGE - 1) +#define ED_POS_ELEMENT_TABS_FIRST (5 * ED_POS_RANGE) +#define ED_POS_ELEMENT_TABS_LAST (6 * ED_POS_RANGE - 1) +#define ED_POS_ELEMENT_SETTINGS_FIRST (6 * ED_POS_RANGE) +#define ED_POS_ELEMENT_SETTINGS_LAST (7 * ED_POS_RANGE - 1) #define ED_LEVEL_TABS_XPOS(n) (ED_POS_LEVEL_TABS_FIRST + (n)) #define ED_LEVEL_TABS_YPOS(n) (ED_POS_LEVEL_TABS_FIRST + (n)) @@ -148,6 +169,12 @@ #define ED_LEVEL_SETTINGS_XPOS(n) (ED_POS_LEVEL_SETTINGS_FIRST + (n)) #define ED_LEVEL_SETTINGS_YPOS(n) (ED_POS_LEVEL_SETTINGS_FIRST + (n)) +#define ED_ENGINE_TABS_XPOS(n) (ED_POS_ENGINE_TABS_FIRST + (n)) +#define ED_ENGINE_TABS_YPOS(n) (ED_POS_ENGINE_TABS_FIRST + (n)) + +#define ED_ENGINE_SETTINGS_XPOS(n) (ED_POS_ENGINE_SETTINGS_FIRST + (n)) +#define ED_ENGINE_SETTINGS_YPOS(n) (ED_POS_ENGINE_SETTINGS_FIRST + (n)) + #define ED_ELEMENT_TABS_XPOS(n) (ED_POS_ELEMENT_TABS_FIRST + (n)) #define ED_ELEMENT_TABS_YPOS(n) (ED_POS_ELEMENT_TABS_FIRST + (n)) @@ -158,6 +185,10 @@ (n) <= ED_POS_LEVEL_TABS_LAST) #define IS_POS_LEVEL_SETTINGS(n) ((n) >= ED_POS_LEVEL_SETTINGS_FIRST && \ (n) <= ED_POS_LEVEL_SETTINGS_LAST) +#define IS_POS_ENGINE_TABS(n) ((n) >= ED_POS_ENGINE_TABS_FIRST && \ + (n) <= ED_POS_ENGINE_TABS_LAST) +#define IS_POS_ENGINE_SETTINGS(n) ((n) >= ED_POS_ENGINE_SETTINGS_FIRST && \ + (n) <= ED_POS_ENGINE_SETTINGS_LAST) #define IS_POS_ELEMENT_TABS(n) ((n) >= ED_POS_ELEMENT_TABS_FIRST && \ (n) <= ED_POS_ELEMENT_TABS_LAST) #define IS_POS_ELEMENT_SETTINGS(n) ((n) >= ED_POS_ELEMENT_SETTINGS_FIRST && \ @@ -165,6 +196,8 @@ #define ED_LEVEL_TABS_LINE(n) ((n) - ED_POS_LEVEL_TABS_FIRST) #define ED_LEVEL_SETTINGS_LINE(n) ((n) - ED_POS_LEVEL_SETTINGS_FIRST) +#define ED_ENGINE_TABS_LINE(n) ((n) - ED_POS_ENGINE_TABS_FIRST) +#define ED_ENGINE_SETTINGS_LINE(n) ((n) - ED_POS_ENGINE_SETTINGS_FIRST) #define ED_ELEMENT_TABS_LINE(n) ((n) - ED_POS_ELEMENT_TABS_FIRST) #define ED_ELEMENT_SETTINGS_LINE(n) ((n) - ED_POS_ELEMENT_SETTINGS_FIRST) @@ -178,6 +211,16 @@ #define ED_LEVEL_SETTINGS_Y(n) (ED_LEVEL_SETTINGS_YSTART + \ (n) * ED_SETTINGS_YOFFSET) +#define ED_ENGINE_TABS_X(n) (ED_ENGINE_TABS_XSTART + \ + (n) * ED_SETTINGS_TABS_XOFFSET) +#define ED_ENGINE_TABS_Y(n) (ED_ENGINE_TABS_YSTART + \ + (n) * ED_SETTINGS_TABS_YOFFSET) + +#define ED_ENGINE_SETTINGS_X(n) (ED_ENGINE_SETTINGS_XSTART + \ + (n) * ED_SETTINGS_XOFFSET) +#define ED_ENGINE_SETTINGS_Y(n) (ED_ENGINE_SETTINGS_YSTART + \ + (n) * ED_SETTINGS_YOFFSET) + #define ED_ELEMENT_TABS_X(n) (ED_ELEMENT_TABS_XSTART + \ (n) * ED_SETTINGS_TABS_XOFFSET) #define ED_ELEMENT_TABS_Y(n) (ED_ELEMENT_TABS_YSTART + \ @@ -198,6 +241,16 @@ #define ED_POS_TO_LEVEL_SETTINGS_Y(n) \ (ED_LEVEL_SETTINGS_Y(ED_LEVEL_SETTINGS_LINE(n))) +#define ED_POS_TO_ENGINE_TABS_X(n) \ + (ED_ENGINE_TABS_X(ED_ENGINE_TABS_LINE(n))) +#define ED_POS_TO_ENGINE_TABS_Y(n) \ + (ED_ENGINE_TABS_Y(ED_ENGINE_TABS_LINE(n))) + +#define ED_POS_TO_ENGINE_SETTINGS_X(n) \ + (ED_ENGINE_SETTINGS_X(ED_ENGINE_SETTINGS_LINE(n))) +#define ED_POS_TO_ENGINE_SETTINGS_Y(n) \ + (ED_ENGINE_SETTINGS_Y(ED_ENGINE_SETTINGS_LINE(n))) + #define ED_POS_TO_ELEMENT_TABS_X(n) \ (ED_ELEMENT_TABS_X(ED_ELEMENT_TABS_LINE(n))) #define ED_POS_TO_ELEMENT_TABS_Y(n) \ @@ -212,6 +265,10 @@ ED_POS_TO_LEVEL_TABS_X(n) : \ IS_POS_LEVEL_SETTINGS(n) ? \ ED_POS_TO_LEVEL_SETTINGS_X(n) : \ + IS_POS_ENGINE_TABS(n) ? \ + ED_POS_TO_ENGINE_TABS_X(n) : \ + IS_POS_ENGINE_SETTINGS(n) ? \ + ED_POS_TO_ENGINE_SETTINGS_X(n) : \ IS_POS_ELEMENT_TABS(n) ? \ ED_POS_TO_ELEMENT_TABS_X(n) : \ IS_POS_ELEMENT_SETTINGS(n) ? \ @@ -220,6 +277,10 @@ ED_POS_TO_LEVEL_TABS_Y(n) : \ IS_POS_LEVEL_SETTINGS(n) ? \ ED_POS_TO_LEVEL_SETTINGS_Y(n) : \ + IS_POS_ENGINE_TABS(n) ? \ + ED_POS_TO_ENGINE_TABS_Y(n) : \ + IS_POS_ENGINE_SETTINGS(n) ? \ + ED_POS_TO_ENGINE_SETTINGS_Y(n) : \ IS_POS_ELEMENT_TABS(n) ? \ ED_POS_TO_ELEMENT_TABS_Y(n) : \ IS_POS_ELEMENT_SETTINGS(n) ? \ @@ -630,8 +691,8 @@ enum GADGET_ID_TIME_OR_STEPS, GADGET_ID_TIME_SCORE_BASE, GADGET_ID_GAME_ENGINE_TYPE, - GADGET_ID_BD_SCHEDULING_TYPE, GADGET_ID_LEVELSET_SAVE_MODE, + GADGET_ID_BD_SCHEDULING_TYPE, GADGET_ID_WIND_DIRECTION, GADGET_ID_PLAYER_SPEED, GADGET_ID_BD_GRAVITY_DIRECTION, @@ -668,6 +729,8 @@ enum GADGET_ID_LEVELCONFIG_LEVELSET, GADGET_ID_LEVELCONFIG_EDITOR, GADGET_ID_LEVELCONFIG_ENGINE, + GADGET_ID_ENGINECONFIG_CONFIG, + GADGET_ID_ENGINECONFIG_COLORS, GADGET_ID_PROPERTIES_INFO, GADGET_ID_PROPERTIES_CONFIG, GADGET_ID_PROPERTIES_CONFIG_1, @@ -960,8 +1023,8 @@ enum ED_SELECTBOX_ID_TIME_OR_STEPS, ED_SELECTBOX_ID_TIME_SCORE_BASE, ED_SELECTBOX_ID_GAME_ENGINE_TYPE, - ED_SELECTBOX_ID_BD_SCHEDULING_TYPE, ED_SELECTBOX_ID_LEVELSET_SAVE_MODE, + ED_SELECTBOX_ID_BD_SCHEDULING_TYPE, ED_SELECTBOX_ID_WIND_DIRECTION, ED_SELECTBOX_ID_PLAYER_SPEED, ED_SELECTBOX_ID_BD_GRAVITY_DIRECTION, @@ -1021,6 +1084,8 @@ enum ED_TEXTBUTTON_ID_LEVELCONFIG_LEVELSET, ED_TEXTBUTTON_ID_LEVELCONFIG_EDITOR, ED_TEXTBUTTON_ID_LEVELCONFIG_ENGINE, + ED_TEXTBUTTON_ID_ENGINECONFIG_CONFIG, + ED_TEXTBUTTON_ID_ENGINECONFIG_COLORS, ED_TEXTBUTTON_ID_PROPERTIES_INFO, ED_TEXTBUTTON_ID_PROPERTIES_CONFIG, ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1, @@ -1038,6 +1103,9 @@ enum #define ED_TAB_BUTTON_ID_LEVELCONFIG_FIRST ED_TEXTBUTTON_ID_LEVELCONFIG_LEVEL #define ED_TAB_BUTTON_ID_LEVELCONFIG_LAST ED_TEXTBUTTON_ID_LEVELCONFIG_ENGINE +#define ED_TAB_BUTTON_ID_ENGINECONFIG_FIRST ED_TEXTBUTTON_ID_ENGINECONFIG_CONFIG +#define ED_TAB_BUTTON_ID_ENGINECONFIG_LAST ED_TEXTBUTTON_ID_ENGINECONFIG_COLORS + #define ED_TAB_BUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO #define ED_TAB_BUTTON_ID_PROPERTIES_LAST ED_TEXTBUTTON_ID_PROPERTIES_CHANGE @@ -1316,6 +1384,10 @@ enum #define ED_MODE_LEVELCONFIG_EDITOR ED_TEXTBUTTON_ID_LEVELCONFIG_EDITOR #define ED_MODE_LEVELCONFIG_ENGINE ED_TEXTBUTTON_ID_LEVELCONFIG_ENGINE +// sub-screens in the engine settings section +#define ED_MODE_ENGINECONFIG_CONFIG ED_TEXTBUTTON_ID_ENGINECONFIG_CONFIG +#define ED_MODE_ENGINECONFIG_COLORS ED_TEXTBUTTON_ID_ENGINECONFIG_COLORS + // sub-screens in the element properties section #define ED_MODE_PROPERTIES_INFO ED_TEXTBUTTON_ID_PROPERTIES_INFO #define ED_MODE_PROPERTIES_CONFIG ED_TEXTBUTTON_ID_PROPERTIES_CONFIG @@ -1655,7 +1727,7 @@ static struct }, { ED_COUNTER_ID_BD_CYCLE_DELAY_MS, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(3), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(3), 50, 500, GADGET_ID_BD_CYCLE_DELAY_MS_DOWN, GADGET_ID_BD_CYCLE_DELAY_MS_UP, GADGET_ID_BD_CYCLE_DELAY_MS_TEXT, GADGET_ID_NONE, @@ -1664,7 +1736,7 @@ static struct }, { ED_COUNTER_ID_BD_CYCLE_DELAY_C64, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(3), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(3), 0, 32, GADGET_ID_BD_CYCLE_DELAY_C64_DOWN, GADGET_ID_BD_CYCLE_DELAY_C64_UP, GADGET_ID_BD_CYCLE_DELAY_C64_TEXT, GADGET_ID_NONE, @@ -1673,7 +1745,7 @@ static struct }, { ED_COUNTER_ID_BD_HATCHING_DELAY_CYCLES, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(4), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(4), 1, 40, GADGET_ID_BD_HATCHING_DELAY_CYCLES_DOWN, GADGET_ID_BD_HATCHING_DELAY_CYCLES_UP, GADGET_ID_BD_HATCHING_DELAY_CYCLES_TEXT, GADGET_ID_NONE, @@ -1682,7 +1754,7 @@ static struct }, { ED_COUNTER_ID_BD_HATCHING_DELAY_SECONDS, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(4), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(4), 1, 40, GADGET_ID_BD_HATCHING_DELAY_SECONDS_DOWN, GADGET_ID_BD_HATCHING_DELAY_SECONDS_UP, GADGET_ID_BD_HATCHING_DELAY_SECONDS_TEXT, GADGET_ID_NONE, @@ -1992,7 +2064,7 @@ static struct int gadget_id; int size; char *value; - char *text_above, *infotext; + char *text_above, *text_left, *text_right, *infotext; } textinput_info[ED_NUM_TEXTINPUT] = { { @@ -2001,7 +2073,7 @@ static struct GADGET_ID_LEVEL_NAME, MAX_LEVEL_NAME_LEN, level.name, - "Title:", "Title for this level" + "Title:", NULL, NULL, "Enter title for this level" }, { ED_TEXTINPUT_ID_LEVEL_AUTHOR, @@ -2009,7 +2081,7 @@ static struct GADGET_ID_LEVEL_AUTHOR, MAX_LEVEL_AUTHOR_LEN, level.author, - "Author:", "Author for this level" + "Author:", NULL, NULL, "Enter author for this level" }, { ED_TEXTINPUT_ID_LEVELSET_NAME, @@ -2017,7 +2089,7 @@ static struct GADGET_ID_LEVELSET_NAME, MAX_LEVEL_NAME_LEN, levelset_name, - "Title:", "Title for this or new level set" + "Title:", NULL, NULL, "Enter title for this or new level set" }, { ED_TEXTINPUT_ID_LEVELSET_AUTHOR, @@ -2025,7 +2097,7 @@ static struct GADGET_ID_LEVELSET_AUTHOR, MAX_LEVEL_AUTHOR_LEN, levelset_author, - "Author:", "Author for this or new level set" + "Author:", NULL, NULL, "Enter author for this or new level set" }, { ED_TEXTINPUT_ID_ELEMENT_NAME, @@ -2033,7 +2105,7 @@ static struct GADGET_ID_ELEMENT_NAME, MAX_ELEMENT_NAME_LEN - 2, // currently 2 chars less editable custom_element.description, - NULL, "Element name" + NULL, NULL, NULL, "Enter element name" } }; @@ -2859,15 +2931,6 @@ static struct &level.game_engine_type, NULL, "Game engine:", NULL, "Select game engine" }, - { - ED_SELECTBOX_ID_BD_SCHEDULING_TYPE, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(1), - GADGET_ID_BD_SCHEDULING_TYPE, GADGET_ID_NONE, - -1, - options_bd_scheduling_type, - &level.bd_scheduling_type, - NULL, "Scheduling type:", NULL, "Select level timing" - }, { ED_SELECTBOX_ID_LEVELSET_SAVE_MODE, ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(10), @@ -2878,6 +2941,20 @@ static struct "Action:", NULL, NULL, "Select action when saving level set" }, + // ---------- engine settings: config --------------------------------------- + + { + ED_SELECTBOX_ID_BD_SCHEDULING_TYPE, + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(1), + GADGET_ID_BD_SCHEDULING_TYPE, GADGET_ID_NONE, + -1, + options_bd_scheduling_type, + &level.bd_scheduling_type, + NULL, "Scheduling type:", NULL, "Select level timing" + }, + + // ---------- engine settings: colors --------------------------------------- + // ---------- element settings: configure (several elements) ---------------- { @@ -3197,7 +3274,24 @@ static struct -1, -1, GADGET_ID_LEVELCONFIG_ENGINE, GADGET_ID_LEVELCONFIG_EDITOR, 8, "Engine", - NULL, NULL, NULL, "Configure engine settings" + NULL, NULL, NULL, "Configure game engine settings" + }, + + // ---------- engine settings (tabs) ---------------------------------------- + + { + ED_TEXTBUTTON_ID_ENGINECONFIG_CONFIG, + ED_ENGINE_TABS_XPOS(0), ED_ENGINE_TABS_YPOS(0), + GADGET_ID_ENGINECONFIG_CONFIG, GADGET_ID_NONE, + 8, "Config", + NULL, NULL, NULL, "Configure game engine settings" + }, + { + ED_TEXTBUTTON_ID_ENGINECONFIG_COLORS, + -1, -1, + GADGET_ID_ENGINECONFIG_COLORS, GADGET_ID_ENGINECONFIG_CONFIG, + 8, "Colors", + NULL, NULL, NULL, "Configure game engine colors" }, // ---------- element settings (tabs) --------------------------------------- @@ -3514,7 +3608,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_INTERMISSION, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(0), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(0), GADGET_ID_BD_INTERMISSION, GADGET_ID_NONE, &level.bd_intermission, "Boulder Dash game engine settings:", NULL, @@ -3522,7 +3616,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_PAL_TIMING, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(2), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(2), GADGET_ID_BD_PAL_TIMING, GADGET_ID_NONE, &level.bd_pal_timing, NULL, NULL, @@ -3530,7 +3624,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_LINE_SHIFTING_BORDERS, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(6), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(6), GADGET_ID_BD_LINE_SHIFTING_BORDERS, GADGET_ID_NONE, &level.bd_line_shifting_borders, "Compatibility settings:", NULL, @@ -3538,7 +3632,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_SCAN_FIRST_AND_LAST_ROW, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(7), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(7), GADGET_ID_BD_SCAN_FIRST_AND_LAST_ROW, GADGET_ID_NONE, &level.bd_scan_first_and_last_row, NULL, NULL, @@ -3546,7 +3640,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_SHORT_EXPLOSIONS, - ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(8), + ED_ENGINE_SETTINGS_XPOS(0), ED_ENGINE_SETTINGS_YPOS(8), GADGET_ID_BD_SHORT_EXPLOSIONS, GADGET_ID_NONE, &level.bd_short_explosions, NULL, NULL, @@ -5090,6 +5184,7 @@ static int redo_buffer_steps = 0; static int edit_mode; static int edit_mode_levelconfig; +static int edit_mode_engineconfig; static int edit_mode_properties; static int element_shift = 0; @@ -8324,7 +8419,11 @@ static void CreateTextInputGadgets(void) y = ED_SETTINGS_Y(textinput_info[i].y); } - sprintf(infotext, "Enter %s", textinput_info[i].infotext); + // determine horizontal offset for leading text + if (textinput_info[i].text_left != NULL) + x += getTextWidthForGadget(textinput_info[i].text_left); + + sprintf(infotext, "%s", textinput_info[i].infotext); infotext[max_infotext_len] = '\0'; gi = CreateGadget(GDI_CUSTOM_ID, id, @@ -8499,6 +8598,7 @@ static void CreateTextbuttonGadgets(void) int type_id = textbutton_info[i].gadget_type_id; int is_tab_button = ((id >= GADGET_ID_LEVELCONFIG_LEVEL && id <= GADGET_ID_LEVELCONFIG_ENGINE) || + (id >= GADGET_ID_ENGINECONFIG_CONFIG && id <= GADGET_ID_ENGINECONFIG_COLORS) || (id >= GADGET_ID_PROPERTIES_INFO && id <= GADGET_ID_PROPERTIES_CHANGE)); int graphic = (is_tab_button ? IMG_EDITOR_TABBUTTON : IMG_EDITOR_TEXTBUTTON); @@ -9074,12 +9174,23 @@ static void MapTextInputGadget(int id) int font_nr = FONT_TEXT_1; int font_height = getFontHeight(font_nr); struct GadgetInfo *gi = level_editor_gadget[textinput_info[id].gadget_id]; + int xoffset_left = getTextWidthForGadget(textinput_info[id].text_left); + int xoffset_right = ED_GADGET_TEXT_DISTANCE; int yoffset_above = font_height + ED_GADGET_LINE_DISTANCE; - int x_above = ED_SETTINGS_X(textinput_info[id].x); - int y_above = ED_SETTINGS_Y(textinput_info[id].y) - yoffset_above; + int yoffset = (gi->height - font_height) / 2; + int x_left = gi->x - xoffset_left; + int x_right = gi->x + gi->width + xoffset_right; + int y_above = gi->y - yoffset_above; + int y = gi->y + yoffset; if (textinput_info[id].text_above) - DrawTextS(x_above, y_above, font_nr, textinput_info[id].text_above); + DrawText(x_left, y_above, textinput_info[id].text_above, font_nr); + + if (textinput_info[id].text_left) + DrawText(x_left, y, textinput_info[id].text_left, font_nr); + + if (textinput_info[id].text_right) + DrawText(x_right, y, textinput_info[id].text_right, font_nr); ModifyGadget(gi, GDI_TEXT_VALUE, textinput_info[id].value, GDI_END); @@ -9119,11 +9230,10 @@ static void MapSelectboxGadget(int id) int x_left = gi->x - xoffset_left; int x_right = gi->x + gi->width + xoffset_right; int y_above = gi->y - yoffset_above; - int x = gi->x; int y = gi->y + yoffset; if (selectbox_info[id].text_above) - DrawText(x, y_above, selectbox_info[id].text_above, font_nr); + DrawText(x_left, y_above, selectbox_info[id].text_above, font_nr); if (selectbox_info[id].text_left) DrawText(x_left, y, selectbox_info[id].text_left, font_nr); @@ -10416,6 +10526,7 @@ void DrawLevelEd(void) { edit_mode = ED_MODE_DRAWING; edit_mode_levelconfig = ED_MODE_LEVELCONFIG_LEVEL; + edit_mode_engineconfig = ED_MODE_ENGINECONFIG_CONFIG; edit_mode_properties = ED_MODE_PROPERTIES_INFO; ResetUndoBuffer(); @@ -10806,6 +10917,39 @@ static Pixel getTabulatorBarColor(void) return GetPixel(gd->bitmap, gd_x, gd_y); } +static void DrawEngineConfigTabulatorGadgets(void) +{ + struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_ENGINECONFIG_CONFIG]; + Pixel tab_color = getTabulatorBarColor(); + int id_first = ED_TEXTBUTTON_ID_ENGINECONFIG_CONFIG; + int id_last = ED_TEXTBUTTON_ID_ENGINECONFIG_COLORS; + int i; + + for (i = id_first; i <= id_last; i++) + { + int gadget_id = textbutton_info[i].gadget_id; + struct GadgetInfo *gi = level_editor_gadget[gadget_id]; + boolean active = (i != edit_mode_engineconfig); + + // draw background line below tabulator button + ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width, 1); + + // draw solid line below inactive tabulator buttons + if (!active && tab_color != BLACK_PIXEL) // black => transparent + FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width, + ED_GADGET_TINY_DISTANCE, tab_color); + + ModifyGadget(gi, GDI_ACTIVE, active, GDI_END); + MapTextbuttonGadget(i); + } + + // draw little border line below tabulator buttons + if (tab_color != BLACK_PIXEL) // black => transparent + FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + + ED_GADGET_TINY_DISTANCE, + getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); +} + static void DrawLevelConfigTabulatorGadgets(void) { struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELCONFIG_LEVEL]; @@ -10841,6 +10985,10 @@ static void DrawLevelConfigTabulatorGadgets(void) FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + ED_GADGET_TINY_DISTANCE, getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); + + // draw second row of engine related tabulators when using native BD engine + if (edit_mode_levelconfig == ED_MODE_LEVELCONFIG_ENGINE) + DrawEngineConfigTabulatorGadgets(); } static void DrawPropertiesTabulatorGadgets(void) @@ -11014,7 +11162,7 @@ static void DrawLevelConfigEditor(void) MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2); } -static void DrawLevelConfigEngine(void) +static void DrawEngineConfigConfig(void) { int i; @@ -11039,6 +11187,19 @@ static void DrawLevelConfigEngine(void) MapSelectboxGadget(i); } +static void DrawEngineConfigColors(void) +{ + // (no settings yet) +} + +static void DrawLevelConfigEngine(void) +{ + if (edit_mode_engineconfig == ED_MODE_ENGINECONFIG_CONFIG) + DrawEngineConfigConfig(); + else if (edit_mode_engineconfig == ED_MODE_ENGINECONFIG_COLORS) + DrawEngineConfigColors(); +} + static void DrawLevelConfigWindow(void) { char *text = "Global Settings"; @@ -15929,6 +16090,13 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi) DrawLevelConfigWindow(); } + else if (type_id >= ED_TAB_BUTTON_ID_ENGINECONFIG_FIRST && + type_id <= ED_TAB_BUTTON_ID_ENGINECONFIG_LAST) + { + edit_mode_engineconfig = gi->custom_type_id; + + DrawLevelConfigWindow(); + } else if (type_id >= ED_TAB_BUTTON_ID_PROPERTIES_FIRST && type_id <= ED_TAB_BUTTON_ID_PROPERTIES_LAST) {