X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=da94af773a97e415fcad886fcfcc57a4cd3cdf08;hp=375b942b03c6fc36a20a4749499f1f98d91a47ba;hb=cb586ba720ddae3c6d05ba1723b5bd4d58bc98bd;hpb=a91eb1729c7bff1a2c274d73bc223f58a0cabf4e diff --git a/src/editor.c b/src/editor.c index 375b942b..da94af77 100644 --- a/src/editor.c +++ b/src/editor.c @@ -32,26 +32,31 @@ */ /* values for the control window */ -#define ED_CTRL1_BUTTONS_HORIZ 4 +#define ED_CTRL1_BUTTONS_HORIZ 4 /* toolbox */ #define ED_CTRL1_BUTTONS_VERT 4 -#define ED_CTRL2_BUTTONS_HORIZ 3 +#define ED_CTRL2_BUTTONS_HORIZ 3 /* level */ #define ED_CTRL2_BUTTONS_VERT 2 -#define ED_CTRL3_BUTTONS_HORIZ 3 +#define ED_CTRL3_BUTTONS_HORIZ 3 /* CE and GE */ #define ED_CTRL3_BUTTONS_VERT 1 -#define ED_CTRL4_BUTTONS_HORIZ 2 +#define ED_CTRL4_BUTTONS_HORIZ 2 /* CE and GE */ #define ED_CTRL4_BUTTONS_VERT 1 -#define ED_CTRL5_BUTTONS_HORIZ 1 +#define ED_CTRL5_BUTTONS_HORIZ 1 /* properties */ #define ED_CTRL5_BUTTONS_VERT 1 +#define ED_CTRL6_BUTTONS_HORIZ 3 /* properties */ +#define ED_CTRL6_BUTTONS_VERT 1 #define ED_NUM_CTRL1_BUTTONS (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT) #define ED_NUM_CTRL2_BUTTONS (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT) #define ED_NUM_CTRL3_BUTTONS (ED_CTRL3_BUTTONS_HORIZ * ED_CTRL3_BUTTONS_VERT) #define ED_NUM_CTRL4_BUTTONS (ED_CTRL4_BUTTONS_HORIZ * ED_CTRL4_BUTTONS_VERT) #define ED_NUM_CTRL5_BUTTONS (ED_CTRL5_BUTTONS_HORIZ * ED_CTRL5_BUTTONS_VERT) +#define ED_NUM_CTRL6_BUTTONS (ED_CTRL6_BUTTONS_HORIZ * ED_CTRL6_BUTTONS_VERT) #define ED_NUM_CTRL1_2_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) #define ED_NUM_CTRL1_3_BUTTONS (ED_NUM_CTRL1_2_BUTTONS + ED_NUM_CTRL3_BUTTONS) #define ED_NUM_CTRL1_4_BUTTONS (ED_NUM_CTRL1_3_BUTTONS + ED_NUM_CTRL4_BUTTONS) -#define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_4_BUTTONS + ED_NUM_CTRL5_BUTTONS) +#define ED_NUM_CTRL1_5_BUTTONS (ED_NUM_CTRL1_4_BUTTONS + ED_NUM_CTRL5_BUTTONS) +#define ED_NUM_CTRL1_6_BUTTONS (ED_NUM_CTRL1_5_BUTTONS + ED_NUM_CTRL6_BUTTONS) +#define ED_NUM_CTRL_BUTTONS ED_NUM_CTRL1_6_BUTTONS /* values for the element list */ #define ED_ELEMENTLIST_XPOS (editor.palette.x) @@ -64,23 +69,22 @@ ED_ELEMENTLIST_BUTTONS_VERT) /* standard distances */ -#define ED_BORDER_SIZE 3 -#define ED_BORDER_TEXT_XSIZE 5 -#define ED_BORDER_AREA_YSIZE 1 -#define ED_ELEMENT_BORDER 8 -#define ED_ELEMENT_BORDER_INPUT 4 - -#define ED_GADGET_DISTANCE 2 -#define ED_GADGET_TEXT_DISTANCE (2 * ED_GADGET_DISTANCE) -#define ED_GADGET_LINE_DISTANCE (2 * ED_GADGET_DISTANCE) +#define ED_GADGET_NORMAL_DISTANCE (editor.gadget.normal_spacing) +#define ED_GADGET_SMALL_DISTANCE (editor.gadget.small_spacing) +#define ED_GADGET_TINY_DISTANCE (editor.gadget.tiny_spacing) +#define ED_GADGET_LINE_DISTANCE (editor.gadget.line_spacing) +#define ED_GADGET_TEXT_DISTANCE (editor.gadget.text_spacing) +#define ED_TAB_BAR_HEIGHT (editor.gadget.separator_line.height) #define ED_DRAWINGAREA_TEXT_DISTANCE (ED_GADGET_TEXT_DISTANCE + \ - MINI_TILEX / 2) + ED_DRAWINGAREA_BORDER_SIZE) +#define ED_GADGET_SPACE_DISTANCE (getFontWidth(FONT_TEXT_1)) -/* values for the settings windows */ -#define ED_SETTINGS1_YPOS MINI_TILEY - -#define ED_ELEMENT_SETTINGS_ELEM_XPOS (2 * MINI_TILEX) -#define ED_ELEMENT_SETTINGS_ELEM_YPOS (4 * MINI_TILEY + MINI_TILEY / 2) +/* values for drawingarea gadgets */ +#define IMG_BORDER_1 IMG_EDITOR_ELEMENT_BORDER +#define IMG_BORDER_2 IMG_EDITOR_ELEMENT_BORDER_INPUT +#define ED_ELEMENT_BORDER (graphic_info[IMG_BORDER_1].border_size) +#define ED_DRAWINGAREA_BORDER_SIZE (graphic_info[IMG_BORDER_2].border_size) +#define ED_DRAWINGAREA_TILE_SIZE (editor.drawingarea.tile_size) /* values for checkbutton gadgets */ #define ED_CHECKBUTTON_XSIZE (graphic_info[IMG_EDITOR_CHECKBOX].width) @@ -89,46 +93,56 @@ #define ED_TABBUTTON_XSIZE (graphic_info[IMG_EDITOR_TABBUTTON].width) #define ED_TABBUTTON_YSIZE (graphic_info[IMG_EDITOR_TABBUTTON].height) -#define ED_TAB_BAR_HEIGHT ED_GADGET_DISTANCE - -#define ED_LEVEL_SETTINGS_BASE_XSTART (3 * MINI_TILEX / 2) -#define ED_LEVEL_SETTINGS_BASE_YSTART (9 * MINI_TILEY / 2) -#define ED_ELEMENT_SETTINGS_BASE_XSTART (3 * MINI_TILEX / 2) -#define ED_ELEMENT_SETTINGS_BASE_YSTART (9 * MINI_TILEY) - -#define ED_LEVEL_SETTINGS_XSTART (ED_LEVEL_SETTINGS_BASE_XSTART) -#define ED_LEVEL_SETTINGS_YSTART (ED_LEVEL_SETTINGS_BASE_YSTART + \ - ED_TABBUTTON_YSIZE + \ - ED_TAB_BAR_HEIGHT + \ - ED_GADGET_DISTANCE + \ - getFontHeight(FONT_TEXT_1) + \ - ED_GADGET_DISTANCE) -#define ED_ELEMENT_SETTINGS_XSTART (ED_ELEMENT_SETTINGS_BASE_XSTART) -#define ED_ELEMENT_SETTINGS_YSTART (ED_ELEMENT_SETTINGS_BASE_YSTART + \ - getFontHeight(FONT_INPUT_2) + \ - ED_GADGET_DISTANCE) +#define ED_LEVEL_SETTINGS_TABS_X (editor.settings.tabs.x) +#define ED_LEVEL_SETTINGS_TABS_Y (editor.settings.tabs.y) +#define ED_ELEMENT_SETTINGS_TABS_X (editor.settings.tabs.x) +#define ED_ELEMENT_SETTINGS_TABS_Y (editor.settings.tabs.y + \ + editor.settings.tabs.yoffset2) + +#define ED_SETTINGS_TABS_XOFFSET (editor.settings.tabs.draw_xoffset) +#define ED_SETTINGS_TABS_YOFFSET (editor.settings.tabs.draw_yoffset) + +#define ED_LEVEL_SETTINGS_XSTART (ED_LEVEL_SETTINGS_TABS_X + \ + ED_SETTINGS_TABS_XOFFSET) +#define ED_LEVEL_SETTINGS_YSTART (ED_LEVEL_SETTINGS_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_SETTINGS_XSTART (ED_ELEMENT_SETTINGS_TABS_X + \ + ED_SETTINGS_TABS_XOFFSET) +#define ED_ELEMENT_SETTINGS_YSTART (ED_ELEMENT_SETTINGS_TABS_Y + \ + ED_TABBUTTON_YSIZE + \ + ED_GADGET_TINY_DISTANCE + \ + ED_TAB_BAR_HEIGHT + \ + ED_SETTINGS_TABS_YOFFSET) #define ED_SETTINGS_XOFFSET (ED_CHECKBUTTON_XSIZE + \ ED_GADGET_TEXT_DISTANCE) #define ED_SETTINGS_YOFFSET (ED_CHECKBUTTON_YSIZE + \ ED_GADGET_LINE_DISTANCE) -#define ED_POS_LEVEL_SETTINGS (100) -#define ED_POS_ELEMENT_SETTINGS (200) +#define ED_POS_LEVEL_SETTINGS_RANGE (10000) +#define ED_POS_LEVEL_SETTINGS_FIRST (1 * ED_POS_LEVEL_SETTINGS_RANGE) +#define ED_POS_LEVEL_SETTINGS_LAST (2 * ED_POS_LEVEL_SETTINGS_RANGE - 1) +#define ED_POS_ELEMENT_SETTINGS_FIRST (2 * ED_POS_LEVEL_SETTINGS_RANGE) +#define ED_POS_ELEMENT_SETTINGS_LAST (3 * ED_POS_LEVEL_SETTINGS_RANGE - 1) -#define ED_LEVEL_SETTINGS_XPOS(n) (ED_POS_LEVEL_SETTINGS + (n)) -#define ED_LEVEL_SETTINGS_YPOS(n) (ED_POS_LEVEL_SETTINGS + (n)) +#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_ELEMENT_SETTINGS_XPOS(n) (ED_POS_ELEMENT_SETTINGS + (n)) -#define ED_ELEMENT_SETTINGS_YPOS(n) (ED_POS_ELEMENT_SETTINGS + (n)) +#define ED_ELEMENT_SETTINGS_XPOS(n) (ED_POS_ELEMENT_SETTINGS_FIRST + (n)) +#define ED_ELEMENT_SETTINGS_YPOS(n) (ED_POS_ELEMENT_SETTINGS_FIRST + (n)) -#define IS_POS_LEVEL_SETTINGS(n) ((n) >= ED_POS_LEVEL_SETTINGS && \ - (n) < ED_POS_LEVEL_SETTINGS + 100) -#define IS_POS_ELEMENT_SETTINGS(n) ((n) >= ED_POS_ELEMENT_SETTINGS && \ - (n) < ED_POS_ELEMENT_SETTINGS + 100) +#define IS_POS_LEVEL_SETTINGS(n) ((n) >= ED_POS_LEVEL_SETTINGS_FIRST && \ + (n) <= ED_POS_LEVEL_SETTINGS_LAST) +#define IS_POS_ELEMENT_SETTINGS(n) ((n) >= ED_POS_ELEMENT_SETTINGS_FIRST && \ + (n) <= ED_POS_ELEMENT_SETTINGS_LAST) -#define ED_LEVEL_SETTINGS_LINE(n) ((n) - ED_POS_LEVEL_SETTINGS) -#define ED_ELEMENT_SETTINGS_LINE(n) ((n) - ED_POS_ELEMENT_SETTINGS) +#define ED_LEVEL_SETTINGS_LINE(n) ((n) - ED_POS_LEVEL_SETTINGS_FIRST) +#define ED_ELEMENT_SETTINGS_LINE(n) ((n) - ED_POS_ELEMENT_SETTINGS_FIRST) #define ED_LEVEL_SETTINGS_X(n) (ED_LEVEL_SETTINGS_XSTART + \ (n) * ED_SETTINGS_XOFFSET) @@ -152,62 +166,95 @@ #define ED_SETTINGS_X(n) (IS_POS_LEVEL_SETTINGS(n) ? \ ED_POS_TO_LEVEL_SETTINGS_X(n) : \ - ED_POS_TO_ELEMENT_SETTINGS_X(n)) + IS_POS_ELEMENT_SETTINGS(n) ? \ + ED_POS_TO_ELEMENT_SETTINGS_X(n) : (n)) #define ED_SETTINGS_Y(n) (IS_POS_LEVEL_SETTINGS(n) ? \ ED_POS_TO_LEVEL_SETTINGS_Y(n) : \ - ED_POS_TO_ELEMENT_SETTINGS_Y(n)) - -#define ED_AREA_SETTINGS_X(i) (ED_SETTINGS_X((i).x) + (i).xoffset) -#define ED_AREA_SETTINGS_Y(i) (ED_SETTINGS_Y((i).y) + (i).yoffset) - -#define ED_LEVEL_SETTINGS_TABS_XPOS (ED_LEVEL_SETTINGS_BASE_XSTART) -#define ED_LEVEL_SETTINGS_TABS_YPOS (4 * MINI_TILEY) -#define ED_ELEMENT_SETTINGS_TABS_XPOS (ED_ELEMENT_SETTINGS_BASE_XSTART) -#define ED_ELEMENT_SETTINGS_TABS_YPOS (8 * MINI_TILEY) + IS_POS_ELEMENT_SETTINGS(n) ? \ + ED_POS_TO_ELEMENT_SETTINGS_Y(n) : (n)) + +#define ED_TAB_SETTINGS_X(n) (IS_POS_LEVEL_SETTINGS(n) ? \ + ED_LEVEL_SETTINGS_TABS_X : \ + ED_ELEMENT_SETTINGS_TABS_X) +#define ED_TAB_SETTINGS_Y(n) (IS_POS_LEVEL_SETTINGS(n) ? \ + ED_LEVEL_SETTINGS_TABS_Y : \ + ED_ELEMENT_SETTINGS_TABS_Y) + +#define ED_SETTINGS_XOFF(n) (5 * ((n) % 4) * \ + ED_DRAWINGAREA_TILE_SIZE) +#define ED_SETTINGS_YOFF(n) (5 * ((n) / 4) * \ + ED_DRAWINGAREA_TILE_SIZE) + +#define ED_AREA_XOFFSET_1(n) ((n) != 0 ? \ + ED_DRAWINGAREA_BORDER_SIZE : 0) +#define ED_AREA_YOFFSET_1(n) ((n) != 0 ? \ + (ED_CHECKBUTTON_YSIZE - \ + ED_DRAWINGAREA_TILE_SIZE) / 2 : 0) + +#define ED_AREA_XOFFSET_2(n) (0) +#define ED_AREA_YOFFSET_2(n) ((n) == 3 ? \ + ((n) - 1) * ED_DRAWINGAREA_TILE_SIZE / 2 : 0) + +#define ED_AREA_SETTINGS_X(i) (ED_SETTINGS_X((i).x) + \ + ED_SETTINGS_XOFF((i).xoffset) + \ + ED_AREA_XOFFSET_1((i).x) - \ + ED_AREA_XOFFSET_2((i).area_xsize)) +#define ED_AREA_SETTINGS_Y(i) (ED_SETTINGS_Y((i).y) + \ + ED_SETTINGS_YOFF((i).yoffset) + \ + ED_AREA_YOFFSET_1((i).y) - \ + ED_AREA_YOFFSET_2((i).area_ysize)) /* values for element content drawing areas */ #define ED_AREA_1X1_LSETTINGS_XPOS(n) ED_LEVEL_SETTINGS_XPOS(n) #define ED_AREA_1X1_LSETTINGS_YPOS(n) ED_LEVEL_SETTINGS_YPOS(n) #define ED_AREA_1X1_LSETTINGS_XOFF (0) -#define ED_AREA_1X1_LSETTINGS_YOFF (ED_GADGET_DISTANCE) +#define ED_AREA_1X1_LSETTINGS_YOFF (0) #define ED_AREA_1X1_SETTINGS_XPOS(n) ED_ELEMENT_SETTINGS_XPOS(n) #define ED_AREA_1X1_SETTINGS_YPOS(n) ED_ELEMENT_SETTINGS_YPOS(n) #define ED_AREA_1X1_SETTINGS_XOFF (0) -#define ED_AREA_1X1_SETTINGS_YOFF (ED_GADGET_DISTANCE) +#define ED_AREA_1X1_SETTINGS_YOFF (0) #define ED_AREA_3X3_SETTINGS_XPOS(n) ED_ELEMENT_SETTINGS_XPOS(n) #define ED_AREA_3X3_SETTINGS_YPOS(n) ED_ELEMENT_SETTINGS_YPOS(n) #define ED_AREA_3X3_SETTINGS_XOFF (0) -#define ED_AREA_3X3_SETTINGS_YOFF (ED_GADGET_DISTANCE - MINI_TILEY) +#define ED_AREA_3X3_SETTINGS_YOFF (0) + +/* element content */ +#define ED_AREA_ELEMENT_CONTENT_XOFF(n) (n) +#define ED_AREA_ELEMENT_CONTENT_YOFF(n) (n) /* yamyam content */ -#define ED_AREA_YAMYAM_CONTENT_XPOS ED_ELEMENT_SETTINGS_XPOS(0) -#define ED_AREA_YAMYAM_CONTENT_YPOS ED_ELEMENT_SETTINGS_YPOS(0) -#define ED_AREA_YAMYAM_CONTENT_XOFF(n) (MINI_TILEX / 2 + \ - 5 * ((n) % 4) * MINI_TILEX) -#define ED_AREA_YAMYAM_CONTENT_YOFF(n) (13 * MINI_TILEY / 2 + \ - 6 * ((n) / 4) * MINI_TILEY) -#define ED_AREA_YAMYAM_CONTENT_X(n) (ED_ELEMENT_SETTINGS_X(0) + \ - ED_AREA_YAMYAM_CONTENT_XOFF(n)) -#define ED_AREA_YAMYAM_CONTENT_Y(n) (ED_ELEMENT_SETTINGS_Y(0) + \ - ED_AREA_YAMYAM_CONTENT_YOFF(n)) +#define ED_XPOS_YAM 0 +#define ED_YPOS_YAM 5 +#define ED_AREA_YAMYAM_CONTENT_XPOS ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_YAM) +#define ED_AREA_YAMYAM_CONTENT_YPOS ED_ELEMENT_SETTINGS_YPOS(ED_YPOS_YAM) +#define ED_AREA_YAMYAM_CONTENT_XOFF(n) ED_AREA_ELEMENT_CONTENT_XOFF(n) +#define ED_AREA_YAMYAM_CONTENT_YOFF(n) ED_AREA_ELEMENT_CONTENT_YOFF(n) +#define ED_AREA_YAMYAM_CONTENT_X(n) (ED_ELEMENT_SETTINGS_X(ED_XPOS_YAM) + \ + ED_SETTINGS_XOFF(n)) +#define ED_AREA_YAMYAM_CONTENT_Y(n) (ED_ELEMENT_SETTINGS_Y(ED_YPOS_YAM) + \ + ED_SETTINGS_YOFF(n) + \ + ED_AREA_YOFFSET_1(ED_YPOS_YAM) - \ + ED_AREA_YOFFSET_2(3)) /* magic ball content */ -#define ED_AREA_MAGIC_BALL_CONTENT_XPOS ED_ELEMENT_SETTINGS_XPOS(0) -#define ED_AREA_MAGIC_BALL_CONTENT_YPOS ED_ELEMENT_SETTINGS_YPOS(0) -#define ED_AREA_MAGIC_BALL_CONTENT_XOFF(n) (MINI_TILEX / 2 + \ - 5 * ((n) % 4) * MINI_TILEX) -#define ED_AREA_MAGIC_BALL_CONTENT_YOFF(n) (16 * MINI_TILEY / 2 + \ - 6 * ((n) / 4) * MINI_TILEY) -#define ED_AREA_MAGIC_BALL_CONTENT_X(n) (ED_ELEMENT_SETTINGS_X(0) + \ - ED_AREA_MAGIC_BALL_CONTENT_XOFF(n)) -#define ED_AREA_MAGIC_BALL_CONTENT_Y(n) (ED_ELEMENT_SETTINGS_Y(0) + \ - ED_AREA_MAGIC_BALL_CONTENT_YOFF(n)) +#define ED_XPOS_BALL 0 +#define ED_YPOS_BALL 6 +#define ED_AREA_MAGIC_BALL_CONTENT_XPOS ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_BALL) +#define ED_AREA_MAGIC_BALL_CONTENT_YPOS ED_ELEMENT_SETTINGS_YPOS(ED_YPOS_BALL) +#define ED_AREA_MAGIC_BALL_CONTENT_XOFF(n) ED_AREA_ELEMENT_CONTENT_XOFF(n) +#define ED_AREA_MAGIC_BALL_CONTENT_YOFF(n) ED_AREA_ELEMENT_CONTENT_YOFF(n) +#define ED_AREA_MAGIC_BALL_CONTENT_X(n) (ED_ELEMENT_SETTINGS_X(ED_XPOS_BALL) + \ + ED_SETTINGS_XOFF(n)) +#define ED_AREA_MAGIC_BALL_CONTENT_Y(n) (ED_ELEMENT_SETTINGS_Y(ED_YPOS_BALL) + \ + ED_SETTINGS_YOFF(n) + \ + ED_AREA_YOFFSET_1(ED_YPOS_BALL) - \ + ED_AREA_YOFFSET_2(3)) /* values for scrolling gadgets for drawing area */ -#define ED_SCROLLBUTTON_XSIZE 16 -#define ED_SCROLLBUTTON_YSIZE 16 +#define ED_SCROLLBUTTON_XSIZE (graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].width) +#define ED_SCROLLBUTTON_YSIZE (graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].height) #define ED_SCROLL_UP_XPOS (SXSIZE - ED_SCROLLBUTTON_XSIZE) #define ED_SCROLL_UP_YPOS (0) @@ -250,10 +297,12 @@ 2 * ED_SCROLLBUTTON2_YSIZE) /* values for ClearEditorGadgetInfoText() and HandleEditorGadgetInfoText() */ -#define INFOTEXT_XPOS SX -#define INFOTEXT_YPOS (SY + SYSIZE - MINI_TILEX + 2) -#define INFOTEXT_XSIZE SXSIZE -#define INFOTEXT_YSIZE MINI_TILEY +#define INFOTEXT_FONT FONT_TEXT_2 +#define INFOTEXT_XSIZE SXSIZE +#define INFOTEXT_YSIZE getFontHeight(INFOTEXT_FONT) +#define INFOTEXT_YSIZE_FULL (INFOTEXT_YSIZE + ED_GADGET_SMALL_DISTANCE) +#define INFOTEXT_XPOS SX +#define INFOTEXT_YPOS (SY + SYSIZE - INFOTEXT_YSIZE) /* @@ -297,9 +346,13 @@ #define GADGET_ID_CUSTOM_PASTE (GADGET_ID_TOOLBOX_FIRST + 26) #define GADGET_ID_PROPERTIES (GADGET_ID_TOOLBOX_FIRST + 27) +#define GADGET_ID_ELEMENT_LEFT (GADGET_ID_TOOLBOX_FIRST + 28) +#define GADGET_ID_ELEMENT_MIDDLE (GADGET_ID_TOOLBOX_FIRST + 29) +#define GADGET_ID_ELEMENT_RIGHT (GADGET_ID_TOOLBOX_FIRST + 30) + /* counter gadget identifiers */ -#define GADGET_ID_COUNTER_FIRST (GADGET_ID_TOOLBOX_FIRST + 28) +#define GADGET_ID_COUNTER_FIRST (GADGET_ID_TOOLBOX_FIRST + 31) #define GADGET_ID_SELECT_LEVEL_DOWN (GADGET_ID_COUNTER_FIRST + 0) #define GADGET_ID_SELECT_LEVEL_TEXT (GADGET_ID_COUNTER_FIRST + 1) @@ -546,45 +599,46 @@ #define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 15) #define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 16) #define GADGET_ID_SHIFTED_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_INITIAL_GRAVITY (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_USE_INITIAL_INVENTORY (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_ENVELOPE_AUTOWRAP (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_ENVELOPE_CENTERED (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 39) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 40) -#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 41) -#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 42) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 43) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 44) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 45) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 46) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 47) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 48) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 49) -#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 50) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 51) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 52) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 53) +#define GADGET_ID_LAZY_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_INITIAL_GRAVITY (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_USE_INITIAL_INVENTORY (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_ENVELOPE_AUTOWRAP (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_ENVELOPE_CENTERED (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 42) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 43) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 44) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 45) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 46) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 47) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 48) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 49) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 50) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 51) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 52) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 53) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 54) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 54) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 55) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -786,44 +840,45 @@ #define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 13 #define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 14 #define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION 15 -#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 16 -#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 17 -#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 18 -#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY 19 -#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY 20 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 21 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 22 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 23 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 24 -#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP 25 -#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED 26 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 27 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 28 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 29 -#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 30 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 31 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 32 -#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 33 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 34 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 35 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 36 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 37 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 38 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 39 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 40 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 41 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 42 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 43 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 44 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 45 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 46 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 47 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 48 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 49 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 50 -#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 51 - -#define ED_NUM_CHECKBUTTONS 52 +#define ED_CHECKBUTTON_ID_LAZY_RELOCATION 16 +#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 17 +#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 18 +#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 19 +#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY 20 +#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY 21 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 22 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 23 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 24 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 25 +#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP 26 +#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED 27 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 28 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 29 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 30 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 31 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 32 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 33 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 34 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 35 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 36 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 37 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 38 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 39 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 40 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 41 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 42 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 43 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 44 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 45 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 46 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 47 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 48 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 49 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 50 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 51 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 52 + +#define ED_NUM_CHECKBUTTONS 53 #define ED_CHECKBUTTON_ID_EDITOR_FIRST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED #define ED_CHECKBUTTON_ID_EDITOR_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -947,7 +1002,7 @@ static struct { int graphic; int gadget_id; - struct XY *pos; + struct XYTileSize *pos; int gadget_type; char *infotext; char shortcut; @@ -959,82 +1014,82 @@ static struct /* ---------- toolbox control buttons ------------------------------------ */ { - IMG_EDITOR_BUTTON_GFX_DRAW_SINGLE, GADGET_ID_SINGLE_ITEMS, + IMG_GFX_EDITOR_BUTTON_DRAW_SINGLE, GADGET_ID_SINGLE_ITEMS, &editor.button.draw_single, GD_TYPE_RADIO_BUTTON, "draw single items", 's' }, { - IMG_EDITOR_BUTTON_GFX_DRAW_CONNECTED, GADGET_ID_CONNECTED_ITEMS, + IMG_GFX_EDITOR_BUTTON_DRAW_CONNECTED, GADGET_ID_CONNECTED_ITEMS, &editor.button.draw_connected, GD_TYPE_RADIO_BUTTON, "draw connected items", 'd' }, { - IMG_EDITOR_BUTTON_GFX_DRAW_LINE, GADGET_ID_LINE, + IMG_GFX_EDITOR_BUTTON_DRAW_LINE, GADGET_ID_LINE, &editor.button.draw_line, GD_TYPE_RADIO_BUTTON, "draw lines", 'l' }, { - IMG_EDITOR_BUTTON_GFX_DRAW_ARC, GADGET_ID_ARC, + IMG_GFX_EDITOR_BUTTON_DRAW_ARC, GADGET_ID_ARC, &editor.button.draw_arc, GD_TYPE_RADIO_BUTTON, "draw arcs", 'a' }, { - IMG_EDITOR_BUTTON_GFX_DRAW_RECTANGLE, GADGET_ID_RECTANGLE, + IMG_GFX_EDITOR_BUTTON_DRAW_RECTANGLE, GADGET_ID_RECTANGLE, &editor.button.draw_rectangle, GD_TYPE_RADIO_BUTTON, "draw outline rectangles", 'r' }, { - IMG_EDITOR_BUTTON_GFX_DRAW_FILLED_BOX, GADGET_ID_FILLED_BOX, + IMG_GFX_EDITOR_BUTTON_DRAW_FILLED_BOX, GADGET_ID_FILLED_BOX, &editor.button.draw_filled_box, GD_TYPE_RADIO_BUTTON, "draw filled rectangles", 'R' }, { - IMG_EDITOR_BUTTON_GFX_ROTATE_UP, GADGET_ID_WRAP_UP, + IMG_GFX_EDITOR_BUTTON_ROTATE_UP, GADGET_ID_WRAP_UP, &editor.button.rotate_up, GD_TYPE_NORMAL_BUTTON, "wrap (rotate) level up", 0 }, { - IMG_EDITOR_BUTTON_GFX_DRAW_TEXT, GADGET_ID_TEXT, + IMG_GFX_EDITOR_BUTTON_DRAW_TEXT, GADGET_ID_TEXT, &editor.button.draw_text, GD_TYPE_RADIO_BUTTON, "enter text elements", 't' }, { - IMG_EDITOR_BUTTON_GFX_FLOOD_FILL, GADGET_ID_FLOOD_FILL, + IMG_GFX_EDITOR_BUTTON_FLOOD_FILL, GADGET_ID_FLOOD_FILL, &editor.button.flood_fill, GD_TYPE_RADIO_BUTTON, "flood fill", 'f' }, { - IMG_EDITOR_BUTTON_GFX_ROTATE_LEFT, GADGET_ID_WRAP_LEFT, + IMG_GFX_EDITOR_BUTTON_ROTATE_LEFT, GADGET_ID_WRAP_LEFT, &editor.button.rotate_left, GD_TYPE_NORMAL_BUTTON, "wrap (rotate) level left", 0 }, { - IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL, GADGET_ID_ZOOM, + IMG_GFX_EDITOR_BUTTON_ZOOM_LEVEL, GADGET_ID_ZOOM, &editor.button.zoom_level, GD_TYPE_NORMAL_BUTTON, - "zoom level tile size", '-' + "zoom level tile size", '+' }, { - IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT, + IMG_GFX_EDITOR_BUTTON_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT, &editor.button.rotate_right, GD_TYPE_NORMAL_BUTTON, "wrap (rotate) level right", 0 }, { - IMG_EDITOR_BUTTON_GFX_DRAW_RANDOM, GADGET_ID_RANDOM_PLACEMENT, + IMG_GFX_EDITOR_BUTTON_DRAW_RANDOM, GADGET_ID_RANDOM_PLACEMENT, &editor.button.draw_random, GD_TYPE_NORMAL_BUTTON, "random element placement", 0 }, { - IMG_EDITOR_BUTTON_GFX_GRAB_BRUSH, GADGET_ID_GRAB_BRUSH, + IMG_GFX_EDITOR_BUTTON_GRAB_BRUSH, GADGET_ID_GRAB_BRUSH, &editor.button.grab_brush, GD_TYPE_RADIO_BUTTON, "grab brush", 'b' }, { - IMG_EDITOR_BUTTON_GFX_ROTATE_DOWN, GADGET_ID_WRAP_DOWN, + IMG_GFX_EDITOR_BUTTON_ROTATE_DOWN, GADGET_ID_WRAP_DOWN, &editor.button.rotate_down, GD_TYPE_NORMAL_BUTTON, "wrap (rotate) level down", 0 }, { - IMG_EDITOR_BUTTON_GFX_PICK_ELEMENT, GADGET_ID_PICK_ELEMENT, + IMG_GFX_EDITOR_BUTTON_PICK_ELEMENT, GADGET_ID_PICK_ELEMENT, &editor.button.pick_element, GD_TYPE_RADIO_BUTTON, "pick drawing element", ',' }, @@ -1042,32 +1097,32 @@ static struct /* ---------- level control buttons -------------------------------------- */ { - IMG_EDITOR_BUTTON_GFX_UNDO, GADGET_ID_UNDO, + IMG_GFX_EDITOR_BUTTON_UNDO, GADGET_ID_UNDO, &editor.button.undo, GD_TYPE_NORMAL_BUTTON, "undo/redo last operation", 'u' }, { - IMG_EDITOR_BUTTON_GFX_CONF, GADGET_ID_INFO, + IMG_GFX_EDITOR_BUTTON_CONF, GADGET_ID_INFO, &editor.button.conf, GD_TYPE_NORMAL_BUTTON, "properties of level", 'I' }, { - IMG_EDITOR_BUTTON_GFX_SAVE, GADGET_ID_SAVE, + IMG_GFX_EDITOR_BUTTON_SAVE, GADGET_ID_SAVE, &editor.button.save, GD_TYPE_NORMAL_BUTTON, "save level", 'S' }, { - IMG_EDITOR_BUTTON_GFX_CLEAR, GADGET_ID_CLEAR, + IMG_GFX_EDITOR_BUTTON_CLEAR, GADGET_ID_CLEAR, &editor.button.clear, GD_TYPE_NORMAL_BUTTON, "clear level", 'C' }, { - IMG_EDITOR_BUTTON_GFX_TEST, GADGET_ID_TEST, + IMG_GFX_EDITOR_BUTTON_TEST, GADGET_ID_TEST, &editor.button.test, GD_TYPE_NORMAL_BUTTON, "test level", 'T' }, { - IMG_EDITOR_BUTTON_GFX_EXIT, GADGET_ID_EXIT, + IMG_GFX_EDITOR_BUTTON_EXIT, GADGET_ID_EXIT, &editor.button.exit, GD_TYPE_NORMAL_BUTTON, "exit level editor", 'E' }, @@ -1075,27 +1130,27 @@ static struct /* ---------- CE and GE control buttons ---------------------------------- */ { - IMG_EDITOR_BUTTON_GFX_CE_COPY_FROM, GADGET_ID_CUSTOM_COPY_FROM, + IMG_GFX_EDITOR_BUTTON_CE_COPY_FROM, GADGET_ID_CUSTOM_COPY_FROM, &editor.button.ce_copy_from, GD_TYPE_RADIO_BUTTON, "copy settings from other element", 0 }, { - IMG_EDITOR_BUTTON_GFX_CE_COPY_TO, GADGET_ID_CUSTOM_COPY_TO, + IMG_GFX_EDITOR_BUTTON_CE_COPY_TO, GADGET_ID_CUSTOM_COPY_TO, &editor.button.ce_copy_to, GD_TYPE_RADIO_BUTTON, "copy settings to other element", 0 }, { - IMG_EDITOR_BUTTON_GFX_CE_SWAP, GADGET_ID_CUSTOM_EXCHANGE, + IMG_GFX_EDITOR_BUTTON_CE_SWAP, GADGET_ID_CUSTOM_EXCHANGE, &editor.button.ce_swap, GD_TYPE_RADIO_BUTTON, "exchange element with other element", 0 }, { - IMG_EDITOR_BUTTON_GFX_CE_COPY, GADGET_ID_CUSTOM_COPY, + IMG_GFX_EDITOR_BUTTON_CE_COPY, GADGET_ID_CUSTOM_COPY, &editor.button.ce_copy, GD_TYPE_NORMAL_BUTTON, "copy settings from this element", 0 }, { - IMG_EDITOR_BUTTON_GFX_CE_PASTE, GADGET_ID_CUSTOM_PASTE, + IMG_GFX_EDITOR_BUTTON_CE_PASTE, GADGET_ID_CUSTOM_PASTE, &editor.button.ce_paste, GD_TYPE_NORMAL_BUTTON, "paste settings to this element", 0 }, @@ -1103,9 +1158,24 @@ static struct /* ---------- palette control buttons ------------------------------------ */ { - IMG_EDITOR_BUTTON_GFX_PROPERTIES, GADGET_ID_PROPERTIES, + IMG_GFX_EDITOR_BUTTON_PROPERTIES, GADGET_ID_PROPERTIES, &editor.button.properties, GD_TYPE_NORMAL_BUTTON, "properties of drawing element", 'p' + }, + { + IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT, GADGET_ID_ELEMENT_LEFT, + &editor.button.element_left, GD_TYPE_NORMAL_BUTTON, + "properties of drawing element 1", '1' + }, + { + IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE, GADGET_ID_ELEMENT_MIDDLE, + &editor.button.element_middle, GD_TYPE_NORMAL_BUTTON, + "properties of drawing element 2", '2' + }, + { + IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT, GADGET_ID_ELEMENT_RIGHT, + &editor.button.element_right, GD_TYPE_NORMAL_BUTTON, + "properties of drawing element 3", '3' } }; @@ -2218,7 +2288,7 @@ static struct /* ---------- element settings: configure (several elements) ------------- */ { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(7), GADGET_ID_PLAYER_SPEED, GADGET_ID_NONE, -1, options_player_speed, @@ -2453,7 +2523,7 @@ static struct } textbutton_info[ED_NUM_TEXTBUTTONS] = { { - ED_LEVEL_SETTINGS_TABS_XPOS, ED_LEVEL_SETTINGS_TABS_YPOS, + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(0), GADGET_ID_LEVELINFO_LEVEL, GADGET_ID_NONE, 8, "Level", NULL, NULL, "Configure level properties" @@ -2465,7 +2535,7 @@ static struct NULL, NULL, "Configure editor properties" }, { - ED_ELEMENT_SETTINGS_TABS_XPOS, ED_ELEMENT_SETTINGS_TABS_YPOS, + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(0), GADGET_ID_PROPERTIES_INFO, GADGET_ID_NONE, 8, "Info", NULL, NULL, "Show information about element" @@ -2536,13 +2606,13 @@ static struct NULL, "change page", "select next change page" }, { - IMG_EDITOR_BUTTON_GFX_CP_COPY, + IMG_GFX_EDITOR_BUTTON_CP_COPY, -1, ED_ELEMENT_SETTINGS_YPOS(14), GADGET_ID_COPY_CHANGE_PAGE, GADGET_ID_NEXT_CHANGE_PAGE, " ", NULL, "copy settings from this change page" }, { - IMG_EDITOR_BUTTON_GFX_CP_PASTE, + IMG_GFX_EDITOR_BUTTON_CP_PASTE, -1, ED_ELEMENT_SETTINGS_YPOS(14), GADGET_ID_PASTE_CHANGE_PAGE, GADGET_ID_COPY_CHANGE_PAGE, NULL, NULL, "paste settings to this change page" @@ -2742,14 +2812,14 @@ static struct "exit level if all fields solved", "automatically finish Sokoban levels" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(8), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(9), GADGET_ID_CONTINUOUS_SNAPPING, GADGET_ID_NONE, &level.continuous_snapping, NULL, "continuous snapping", "use snapping without releasing key" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(7), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(8), GADGET_ID_BLOCK_SNAP_FIELD, GADGET_ID_NONE, &level.block_snap_field, NULL, @@ -2784,28 +2854,35 @@ static struct "no centering when relocating", "level not centered after relocation" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(9), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + GADGET_ID_LAZY_RELOCATION, GADGET_ID_NONE, + &level.lazy_relocation, + NULL, + "only redraw off-screen relocation","no redraw if relocation target visible" + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(10), GADGET_ID_USE_START_ELEMENT, GADGET_ID_NONE, &level.use_start_element[0], NULL, "use level start element:", "start level at this element's position" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(10), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(11), GADGET_ID_USE_ARTWORK_ELEMENT, GADGET_ID_NONE, &level.use_artwork_element[0], NULL, "use artwork from element:", "use player artwork from other element" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(11), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(12), GADGET_ID_USE_EXPLOSION_ELEMENT, GADGET_ID_NONE, &level.use_explosion_element[0], NULL, "use explosion from element:", "use explosion properties from element" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(12), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(13), GADGET_ID_INITIAL_GRAVITY, GADGET_ID_NONE, &level.initial_player_gravity[0], NULL, @@ -2819,7 +2896,7 @@ static struct "use initial inventory:", "use collected elements on level start" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), GADGET_ID_CAN_PASS_TO_WALKABLE, GADGET_ID_NONE, &level.can_pass_to_walkable, NULL, @@ -3209,7 +3286,7 @@ static struct /* ---------- level start element ---------------------------------------- */ { - -1, ED_AREA_1X1_SETTINGS_YPOS(9), + -1, ED_AREA_1X1_SETTINGS_YPOS(10), 0, ED_AREA_1X1_SETTINGS_YOFF, GADGET_ID_START_ELEMENT, GADGET_ID_USE_START_ELEMENT, &level.start_element[0], 1, 1, @@ -3219,7 +3296,7 @@ static struct /* ---------- player artwork element ------------------------------------- */ { - -1, ED_AREA_1X1_SETTINGS_YPOS(10), + -1, ED_AREA_1X1_SETTINGS_YPOS(11), 0, ED_AREA_1X1_SETTINGS_YOFF, GADGET_ID_ARTWORK_ELEMENT, GADGET_ID_USE_ARTWORK_ELEMENT, &level.artwork_element[0], 1, 1, @@ -3229,7 +3306,7 @@ static struct /* ---------- player explosion element ----------------------------------- */ { - -1, ED_AREA_1X1_SETTINGS_YPOS(11), + -1, ED_AREA_1X1_SETTINGS_YPOS(12), 0, ED_AREA_1X1_SETTINGS_YOFF, GADGET_ID_EXPLOSION_ELEMENT, GADGET_ID_USE_EXPLOSION_ELEMENT, &level.explosion_element[0], 1, 1, @@ -3366,7 +3443,7 @@ static int ed_fieldx, ed_fieldy; /* actual position of level editor drawing area in level playfield */ static int level_xpos = -1, level_ypos = -1; -/* actual tile size used to display level editor playfield */ +/* actual tile size used to display playfield drawing area */ static int ed_tilesize = DEFAULT_EDITOR_TILESIZE; #define IN_ED_FIELD(x,y) IN_FIELD(x, y, ed_fieldx, ed_fieldy) @@ -3380,10 +3457,8 @@ static int new_element3 = EL_SAND; #define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \ (button) == 2 ? new_element2 : \ (button) == 3 ? new_element3 : EL_EMPTY) -#define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : \ - (button) == 2 ? 5 : \ - (button) == 3 ? 10 : \ - (button)) + +#define BUTTON_TILE_SIZE(x) ((x) >= TILESIZE ? TILESIZE : MINI_TILESIZE) /* forward declaration for internal use */ static void ModifyEditorCounterValue(int, int); @@ -4873,7 +4948,7 @@ editor_elements_info[] = static int getMaxInfoTextLength() { - return (SXSIZE / getFontWidth(FONT_TEXT_2)); + return (SXSIZE / getFontWidth(INFOTEXT_FONT)); } static int getTextWidthForGadget(char *text) @@ -5177,9 +5252,9 @@ void PrintEditorElementList() int cascade_element_show = EL_CASCADE_INACTIVE(cascade_element); char *headline = element_info[cascade_element_show].editor_description; - printf_line_with_prefix("# ", "-", 77); - printf("# %s\n", headline); - printf_line_with_prefix("# ", "-", 77); + PrintLineWithPrefix("# ", "-", 77); + Print("# %s\n", headline); + PrintLineWithPrefix("# ", "-", 77); } for (j = 0; j < *editor_elements_info[i].headline_list_size; j++) @@ -5189,21 +5264,21 @@ void PrintEditorElementList() if (IS_EDITOR_CASCADE(element)) element = EL_CHAR_MINUS; - printf("# %s\n", element_info[element].token_name); + Print("# %s\n", element_info[element].token_name); } if (j > 0) - printf("#\n"); + Print("#\n"); for (j = 0; j < *editor_elements_info[i].element_list_size; j++) { int element = (*editor_elements_info[i].element_list)[j]; - printf("# %s\n", element_info[element].token_name); + Print("# %s\n", element_info[element].token_name); } if (j > 0) - printf("#\n"); + Print("#\n"); } } @@ -5244,39 +5319,47 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height, { int border_graphic = (input ? IMG_EDITOR_ELEMENT_BORDER_INPUT : IMG_EDITOR_ELEMENT_BORDER); - Bitmap *src_bitmap; - int src_x, src_y; - int bx = (input ? ED_ELEMENT_BORDER_INPUT : ED_ELEMENT_BORDER); - int by = (input ? ED_ELEMENT_BORDER_INPUT : ED_ELEMENT_BORDER); - int bx2 = TILEX - bx; - int by2 = TILEY - by; + struct GraphicInfo *g = &graphic_info[border_graphic]; + Bitmap *src_bitmap = g->bitmap; + int src_x = g->src_x; + int src_y = g->src_y; + int border_size = g->border_size; + int border_xpos = g->width - border_size; + int border_ypos = g->height - border_size; + int tilesize = ED_DRAWINGAREA_TILE_SIZE; int i; - getFixedGraphicSource(border_graphic, 0, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, drawto, src_x, src_y, - bx, by, dest_x - bx, dest_y - by); - BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y, - bx, by, dest_x + width, dest_y - by); - BlitBitmap(src_bitmap, drawto, src_x, src_y + by2, - bx, by, dest_x - bx, dest_y + height); - BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y + by2, - bx, by, dest_x + width, dest_y + height); - - for (i = 0; i < width / MINI_TILEX; i++) - { - BlitBitmap(src_bitmap, drawto, src_x + bx, src_y, MINI_TILEX, by, - dest_x + i * MINI_TILEX, dest_y - by); - BlitBitmap(src_bitmap, drawto, src_x + bx, src_y + by2, MINI_TILEX, by, - dest_x + i * MINI_TILEX, dest_y + height); - } - - for (i = 0; i < height / MINI_TILEY; i++) - { - BlitBitmap(src_bitmap, drawto, src_x, src_y + by, bx, MINI_TILEY, - dest_x - bx, dest_y + i * MINI_TILEY); - BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y + by, bx, MINI_TILEY, - dest_x + width, dest_y + i * MINI_TILEY); + border_size, border_size, + dest_x - border_size, dest_y - border_size); + BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y, + border_size, border_size, + dest_x + width, dest_y - border_size); + BlitBitmap(src_bitmap, drawto, src_x, src_y + border_ypos, + border_size, border_size, + dest_x - border_size, dest_y + height); + BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y + border_ypos, + border_size, border_size, + dest_x + width, dest_y + height); + + for (i = 0; i < width / tilesize; i++) + { + BlitBitmap(src_bitmap, drawto, src_x + border_size, src_y, + tilesize, border_size, + dest_x + i * tilesize, dest_y - border_size); + BlitBitmap(src_bitmap, drawto, src_x + border_size, src_y + border_ypos, + tilesize, border_size, + dest_x + i * tilesize, dest_y + height); + } + + for (i = 0; i < height / tilesize; i++) + { + BlitBitmap(src_bitmap, drawto, src_x, src_y + border_size, + border_size, tilesize, + dest_x - border_size, dest_y + i * tilesize); + BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y + border_size, + border_size, tilesize, + dest_x + width, dest_y + i * tilesize); } ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2); @@ -5305,13 +5388,14 @@ static void DrawDrawingArea(int id) int *value = drawingarea_info[id].value; int area_xsize = drawingarea_info[id].area_xsize; int area_ysize = drawingarea_info[id].area_ysize; + int tilesize = ED_DRAWINGAREA_TILE_SIZE; for (x = 0; x < area_xsize; x++) for (y = 0; y < area_ysize; y++) - DrawMiniGraphicExt(drawto, - gi->x + x * MINI_TILEX, - gi->y + y * MINI_TILEY, - el2edimg(value[x * area_ysize + y])); + DrawSizedGraphicExt(drawto, + gi->x + x * tilesize, + gi->y + y * tilesize, + el2edimg(value[x * area_ysize + y]), 0, tilesize); } static void ScrollEditorLevel(int from_x, int from_y, int scroll) @@ -5345,13 +5429,10 @@ static void ScrollEditorLevel(int from_x, int from_y, int scroll) BackToFront(); } -void getElementListGraphicSource(int element, Bitmap **bitmap, int *x, int *y) +void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap, + int *x, int *y) { - int graphic = el2edimg(element); - int tile_size = (editor.palette.tile_size >= TILESIZE ? TILESIZE : - MINI_TILESIZE); - - getSizedGraphicSource(graphic, 0, tile_size, bitmap, x, y); + getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y); } static void CreateControlButtons() @@ -5365,8 +5446,11 @@ static void CreateControlButtons() int id = controlbutton_info[i].gadget_id; int type = controlbutton_info[i].gadget_type; int graphic = controlbutton_info[i].graphic; - struct XY *pos = controlbutton_info[i].pos; + struct XYTileSize *pos = controlbutton_info[i].pos; struct GraphicInfo *gd = &graphic_info[graphic]; + Bitmap *deco_bitmap = NULL; + int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0; + int tile_size = 0, deco_shift = 0; int gd_x1 = gd->src_x; int gd_y1 = gd->src_y; int gd_x2 = gd->src_x + gd->pressed_xoffset; @@ -5405,6 +5489,33 @@ static void CreateControlButtons() x += DX; y += DY; } + else if (id == GADGET_ID_ELEMENT_LEFT || + id == GADGET_ID_ELEMENT_MIDDLE || + id == GADGET_ID_ELEMENT_RIGHT) + { + x += DX; + y += DY; + + int element = (id == GADGET_ID_ELEMENT_LEFT ? new_element1 : + id == GADGET_ID_ELEMENT_MIDDLE ? new_element2 : + id == GADGET_ID_ELEMENT_RIGHT ? new_element3 : EL_EMPTY); + + tile_size = BUTTON_TILE_SIZE(id == GADGET_ID_ELEMENT_LEFT ? + editor.button.element_left.tile_size : + id == GADGET_ID_ELEMENT_MIDDLE ? + editor.button.element_middle.tile_size : + id == GADGET_ID_ELEMENT_RIGHT ? + editor.button.element_right.tile_size : 0); + + // make sure that decoration does not overlap gadget border + tile_size = MIN(tile_size, MIN(gd->width, gd->height)); + + getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x,&deco_y); + + deco_xpos = (gd->width - tile_size) / 2; + deco_ypos = (gd->height - tile_size) / 2; + deco_shift = 1; + } else { x += EX; @@ -5426,6 +5537,10 @@ static void CreateControlButtons() GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2, GDI_ALT_DESIGN_UNPRESSED, gd->bitmap, gd_x1a, gd_y1a, GDI_ALT_DESIGN_PRESSED, gd->bitmap, gd_x2a, gd_y2a, + GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y, + GDI_DECORATION_POSITION, deco_xpos, deco_ypos, + GDI_DECORATION_SIZE, tile_size, tile_size, + GDI_DECORATION_SHIFTING, deco_shift, deco_shift, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_INFO, HandleEditorGadgetInfoText, GDI_CALLBACK_ACTION, HandleControlButtons, @@ -5520,11 +5635,11 @@ static void CreateControlButtons() int x = DX + ED_ELEMENTLIST_XPOS + xx * gd->width; int y = DY + ED_ELEMENTLIST_YPOS + yy * gd->height; int element = editor_elements[i]; - int tile_size = (editor.palette.tile_size >= TILESIZE ? TILESIZE : - MINI_TILESIZE); + int tile_size = BUTTON_TILE_SIZE(editor.palette.tile_size); unsigned int event_mask = GD_EVENT_RELEASED; - getElementListGraphicSource(element, &deco_bitmap, &deco_x, &deco_y); + getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x, &deco_y); + deco_xpos = (gd->width - tile_size) / 2; deco_ypos = (gd->height - tile_size) / 2; @@ -5592,8 +5707,8 @@ static void CreateCounterButtons() if (i == ED_COUNTER_ID_SELECT_LEVEL) { graphic = (j == 0 ? - IMG_EDITOR_BUTTON_GFX_PREV_LEVEL : - IMG_EDITOR_BUTTON_GFX_NEXT_LEVEL); + IMG_GFX_EDITOR_BUTTON_PREV_LEVEL : + IMG_GFX_EDITOR_BUTTON_NEXT_LEVEL); event_mask |= GD_EVENT_RELEASED; @@ -5648,7 +5763,7 @@ static void CreateCounterButtons() right_gadget_border[id] = getRightGadgetBorder(gi, counterbutton_info[i].text_right); - x += gi->width + ED_GADGET_DISTANCE; /* text count button */ + x += gi->width + ED_GADGET_SMALL_DISTANCE; /* text count button */ if (j == 0) { @@ -5661,7 +5776,7 @@ static void CreateCounterButtons() if (i == ED_COUNTER_ID_SELECT_LEVEL) { - graphic = IMG_EDITOR_INPUT_GFX_LEVEL_NUMBER; + graphic = IMG_GFX_EDITOR_INPUT_LEVEL_NUMBER; font_type = FONT_LEVEL_NUMBER; font_type_active = FONT_LEVEL_NUMBER_ACTIVE; @@ -5709,7 +5824,7 @@ static void CreateCounterButtons() right_gadget_border[id] = getRightGadgetBorder(gi, counterbutton_info[i].text_right); - x += gi->width + ED_GADGET_DISTANCE; /* up count button */ + x += gi->width + ED_GADGET_SMALL_DISTANCE; /* up count button */ } } } @@ -5732,6 +5847,8 @@ static void CreateDrawingAreas() int y = SY + ED_AREA_SETTINGS_Y(drawingarea_info[i]); int area_xsize = drawingarea_info[i].area_xsize; int area_ysize = drawingarea_info[i].area_ysize; + int item_size = (id == GADGET_ID_DRAWING_LEVEL ? + ed_tilesize : ED_DRAWINGAREA_TILE_SIZE); event_mask = GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING | @@ -5752,7 +5869,7 @@ static void CreateDrawingAreas() GDI_Y, y, GDI_TYPE, GD_TYPE_DRAWING_AREA, GDI_AREA_SIZE, area_xsize, area_ysize, - GDI_ITEM_SIZE, ed_tilesize, ed_tilesize, + GDI_ITEM_SIZE, item_size, item_size, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_INFO, HandleDrawingAreaInfo, GDI_CALLBACK_ACTION, HandleDrawingAreas, @@ -5770,11 +5887,6 @@ static void CreateDrawingAreas() static void CreateTextInputGadgets() { struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT]; - int border_size = gd->border_size; - int font_nr = FONT_INPUT_1; - int font_height = getFontHeight(font_nr); - int xoffset = TILEX + ED_ELEMENT_BORDER + 3 * border_size; - int yoffset = (TILEY - font_height) / 2; int max_infotext_len = getMaxInfoTextLength(); int i; @@ -5792,8 +5904,19 @@ static void CreateTextInputGadgets() if (i == ED_TEXTINPUT_ID_ELEMENT_NAME) { - x = ED_ELEMENT_SETTINGS_ELEM_XPOS + xoffset - border_size; - y = ED_ELEMENT_SETTINGS_ELEM_YPOS + yoffset - border_size; + int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size; + int border_size = gd->border_size; + int font_nr = FONT_INPUT_1; + int font_height = getFontHeight(font_nr); + int xoffset = element_border + TILEX + element_border + 3 * border_size; + int yoffset = element_border + (TILEY - font_height) / 2; + + x = (editor.settings.element_name.x != -1 ? + editor.settings.element_name.x : + editor.settings.element_graphic.x + xoffset) - border_size; + y = (editor.settings.element_name.y != -1 ? + editor.settings.element_name.y : + editor.settings.element_graphic.y + yoffset) - border_size; } else { @@ -5976,7 +6099,7 @@ static void CreateTextbuttonGadgets() int graphic = (is_tab_button ? IMG_EDITOR_TABBUTTON : IMG_EDITOR_TEXTBUTTON); int gadget_distance = - (is_tab_button ? ED_GADGET_DISTANCE : ED_GADGET_TEXT_DISTANCE); + (is_tab_button ? ED_GADGET_SMALL_DISTANCE : ED_GADGET_TEXT_DISTANCE); struct GraphicInfo *gd = &graphic_info[graphic]; int gd_x1 = gd->src_x; int gd_y1 = gd->src_y; @@ -5989,8 +6112,8 @@ static void CreateTextbuttonGadgets() struct GadgetInfo *gi; unsigned int event_mask; char infotext[MAX_OUTPUT_LINESIZE + 1]; - int x = SX + textbutton_info[i].x; - int y = SY + textbutton_info[i].y; + int x = SX + ED_TAB_SETTINGS_X(textbutton_info[i].x); + int y = SY + ED_TAB_SETTINGS_Y(textbutton_info[i].y); if (textbutton_info[i].size == -1) /* dynamically determine size */ textbutton_info[i].size = strlen(textbutton_info[i].text); @@ -6148,8 +6271,10 @@ static void CreateScrollbarGadgets() int id = scrollbar_info[i].gadget_id; int graphic = scrollbar_info[i].graphic; struct GraphicInfo *gd = &graphic_info[graphic]; - Bitmap *gd_bitmap = gd->bitmap; - int gd_x1, gd_x2, gd_y1, gd_y2; + int gd_x1 = gd->src_x; + int gd_y1 = gd->src_y; + int gd_x2 = gd->src_x + gd->pressed_xoffset; + int gd_y2 = gd->src_y + gd->pressed_yoffset; struct GadgetInfo *gi; int items_max, items_visible, item_position; unsigned int event_mask; @@ -6178,11 +6303,6 @@ static void CreateScrollbarGadgets() event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS; - gd_x1 = gd->src_x; - gd_y1 = gd->src_y; - gd_x2 = gd->src_x + gd->pressed_xoffset; - gd_y2 = gd->src_y + gd->pressed_yoffset; - gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, GDI_INFO_TEXT, scrollbar_info[i].infotext, @@ -6199,9 +6319,9 @@ static void CreateScrollbarGadgets() GDI_WHEEL_AREA_WIDTH, scrollbar_pos[i].wheel_width, GDI_WHEEL_AREA_HEIGHT, scrollbar_pos[i].wheel_height, GDI_STATE, GD_BUTTON_UNPRESSED, - GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1, - GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2, - GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE, + GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1, + GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2, + GDI_BORDER_SIZE, gd->border_size, gd->border_size, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_INFO, HandleEditorGadgetInfoText, GDI_CALLBACK_ACTION, HandleControlButtons, @@ -6340,10 +6460,8 @@ static void CreateRadiobuttonGadgets() void CreateLevelEditorGadgets() { - int old_game_status = game_status; - - /* setting 'game_status' is needed to get the right fonts for the editor */ - game_status = GAME_MODE_EDITOR; + /* force EDITOR font inside level editor */ + SetFontStatus(GAME_MODE_EDITOR); /* these values are not constant, but can change at runtime */ ed_fieldx = MAX_ED_FIELDX - 1; @@ -6377,7 +6495,7 @@ void CreateLevelEditorGadgets() CreateTextbuttonGadgets(); CreateDrawingAreas(); - game_status = old_game_status; + ResetFontStatus(); } void FreeLevelEditorGadgets() @@ -6466,8 +6584,9 @@ static void MapControlButtons() for (i = 0; i < ED_NUM_CTRL1_2_BUTTONS; i++) MapGadget(level_editor_gadget[i]); - /* map toolbox buttons (element properties button) */ - MapGadget(level_editor_gadget[ED_NUM_CTRL1_4_BUTTONS]); + /* map toolbox buttons (element properties buttons) */ + for (i = ED_NUM_CTRL1_4_BUTTONS; i < ED_NUM_CTRL1_6_BUTTONS; i++) + MapGadget(level_editor_gadget[i]); /* map buttons to select elements */ for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++) @@ -6510,7 +6629,8 @@ static void MapDrawingArea(int id) if (id != ED_DRAWING_ID_DRAWING_LEVEL) { DrawElementBorder(gi->x, gi->y, - area_xsize * MINI_TILEX, area_ysize * MINI_TILEY, TRUE); + area_xsize * ED_DRAWINGAREA_TILE_SIZE, + area_ysize * ED_DRAWINGAREA_TILE_SIZE, TRUE); DrawDrawingArea(id); } @@ -7543,7 +7663,7 @@ static int getMaxEdFieldX(boolean has_scrollbar) static int getMaxEdFieldY(boolean has_scrollbar) { - int infotext_height = INFOTEXT_YSIZE; + int infotext_height = INFOTEXT_YSIZE_FULL; int scrollbar_height = (has_scrollbar ? ED_SCROLLBUTTON_YSIZE : 0); int sysize = SYSIZE - scrollbar_height - infotext_height; int max_ed_fieldy = sysize / ed_tilesize; @@ -7557,25 +7677,23 @@ void InitZoomLevelSettings() MAX_ED_FIELDY = getMaxEdFieldY(FALSE); } -static boolean playfield_area_changed = FALSE; - void DrawLevelEd() { - StopAnimation(); + int fade_mask = REDRAW_FIELD; - CloseDoor(DOOR_CLOSE_ALL); + FadeSoundsAndMusic(); - FadeOut(REDRAW_FIELD); + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; - /* needed after playing if editor playfield area has different size */ - ClearRectangle(drawto, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); + FadeOut(fade_mask); /* needed if different viewport properties defined for editor */ ChangeViewportPropertiesIfNeeded(); - InitZoomLevelSettings(); + ClearField(); - playfield_area_changed = DrawingAreaChanged(); + InitZoomLevelSettings(); OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY); @@ -7609,7 +7727,9 @@ void DrawLevelEd() BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto, graphic_info[IMG_BACKGROUND_PALETTE].src_x, graphic_info[IMG_BACKGROUND_PALETTE].src_y, - DXSIZE, DYSIZE, DX, DY); + MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width), + MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height), + DX, DY); /* draw bigger door */ DrawSpecialEditorDoor(); @@ -7618,7 +7738,9 @@ void DrawLevelEd() BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto, graphic_info[IMG_BACKGROUND_TOOLBOX].src_x, graphic_info[IMG_BACKGROUND_TOOLBOX].src_y, - EXSIZE, EYSIZE, EX, EY); + MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width), + MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height), + EX, EY); // redraw_mask |= REDRAW_ALL; @@ -7635,7 +7757,9 @@ void DrawLevelEd() DrawEditModeWindow(); - FadeIn(playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD); + DrawMaskedBorder(fade_mask); + + FadeIn(fade_mask); /* copy actual editor door content to door double buffer for OpenDoor() */ BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); @@ -7799,7 +7923,8 @@ static void ModifyEditorCounterLimits(int counter_id, int min, int max) struct GadgetInfo *gi_up = level_editor_gadget[gadget_id_up]; ModifyGadget(gi, GDI_TEXT_SIZE, (max < 10 ? 1 : 3), GDI_END); - ModifyGadget(gi_up, GDI_X, gi->x + gi->width + ED_GADGET_DISTANCE,GDI_END); + ModifyGadget(gi_up, GDI_X, gi->x + gi->width + ED_GADGET_SMALL_DISTANCE, + GDI_END); } } @@ -7846,10 +7971,11 @@ static void ModifyEditorElementList() struct GadgetInfo *gi = level_editor_gadget[gadget_id]; struct GadgetDesign *gd = &gi->deco.design; int element = editor_elements[element_shift + i]; + int tile_size = BUTTON_TILE_SIZE(editor.palette.tile_size); UnmapGadget(gi); - getElementListGraphicSource(element, &gd->bitmap, &gd->x, &gd->y); + getEditorGraphicSource(element, tile_size, &gd->bitmap, &gd->x, &gd->y); ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END); @@ -7857,12 +7983,28 @@ static void ModifyEditorElementList() } } -static void DrawDrawingElement(int element, struct EditorPaletteElementInfo *e) +static void DrawDrawingElementGraphic(int element, struct XYTileSize *pos) { int graphic = el2edimg(element); - int tile_size = (e->tile_size >= TILESIZE ? TILESIZE : MINI_TILESIZE); + int tile_size = BUTTON_TILE_SIZE(pos->tile_size); - DrawSizedGraphicExt(drawto, DX + e->x, DY + e->y, graphic, 0, tile_size); + if (pos->x == -1 && + pos->y == -1) + return; + + DrawSizedGraphicExt(drawto, DX + pos->x, DY + pos->y, graphic, 0, tile_size); +} + +static void ModifyDrawingElementButton(int element, int id) +{ + struct GadgetInfo *gi = level_editor_gadget[id]; + Bitmap *deco_bitmap; + int deco_x, deco_y; + int tile_size = gi->deco.width; + + getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x, &deco_y); + + ModifyGadget(gi, GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y, GDI_END); } static void PickDrawingElement(int button, int element) @@ -7870,12 +8012,13 @@ static void PickDrawingElement(int button, int element) struct { int *new_element; - struct EditorPaletteElementInfo *e; + struct XYTileSize *pos; + int id; } de, drawing_elements[] = { - { &new_element1, &editor.palette.element_left }, - { &new_element2, &editor.palette.element_middle }, - { &new_element3, &editor.palette.element_right }, + { &new_element1, &editor.palette.element_left, GADGET_ID_ELEMENT_LEFT }, + { &new_element2, &editor.palette.element_middle, GADGET_ID_ELEMENT_MIDDLE }, + { &new_element3, &editor.palette.element_right, GADGET_ID_ELEMENT_RIGHT }, }; if (button < 1 || button > 3) @@ -7883,7 +8026,10 @@ static void PickDrawingElement(int button, int element) de = drawing_elements[button - 1]; - DrawDrawingElement((*de.new_element = element), de.e); + *de.new_element = element; // update global drawing element variable + + DrawDrawingElementGraphic(element, de.pos); + ModifyDrawingElementButton(element, de.id); redraw_mask |= REDRAW_DOOR_1; } @@ -7951,7 +8097,8 @@ static void DrawLevelInfoTabulatorGadgets() /* 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, 1, tab_color); + 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); @@ -7959,7 +8106,8 @@ static void DrawLevelInfoTabulatorGadgets() /* 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 + 1, + FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + + ED_GADGET_TINY_DISTANCE, getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); } @@ -7999,7 +8147,8 @@ static void DrawPropertiesTabulatorGadgets() /* 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, 1, tab_color); + 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); @@ -8007,7 +8156,8 @@ static void DrawPropertiesTabulatorGadgets() /* 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 + 1, + FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + + ED_GADGET_TINY_DISTANCE, getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); } @@ -8050,6 +8200,12 @@ static void DrawLevelInfoEditor() static void DrawLevelInfoWindow() { + char *text = "Global Settings"; + int font_nr = FONT_TITLE_1; + struct MenuPosInfo *pos = &editor.settings.headline; + int sx = SX + ALIGNED_XPOS(pos->x, getTextWidth(text, font_nr), pos->align); + int sy = SY + pos->y; + stick_element_properties_window = FALSE; UnmapLevelEditorFieldGadgets(); @@ -8057,7 +8213,7 @@ static void DrawLevelInfoWindow() SetMainBackgroundImage(IMG_BACKGROUND_EDITOR); ClearField(); - DrawTextSCentered(ED_SETTINGS1_YPOS, FONT_TITLE_1, "Global Settings"); + DrawText(sx, sy, text, font_nr); DrawLevelInfoTabulatorGadgets(); @@ -8074,7 +8230,7 @@ static void DrawCustomContentArea() int x1 = right_gadget_border[GADGET_ID_CUSTOM_DEADLINESS]; int x2 = right_gadget_border[GADGET_ID_CUSTOM_EXPLOSION_TYPE]; int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT]; - int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; + int xoffset = ED_GADGET_SPACE_DISTANCE; /* add distance for potential left text (without drawing area border) */ x2 += getTextWidthForGadget(drawingarea_info[id].text_left); @@ -8091,17 +8247,32 @@ static void DrawCustomChangeContentArea() int x1 = right_gadget_border[GADGET_ID_CHANGE_USE_CONTENT]; int x2 = right_gadget_border[GADGET_ID_CHANGE_REPLACE_WHEN]; int x3 = right_gadget_border[GADGET_ID_CHANGE_ONLY_COMPLETE]; - int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; + int xoffset = ED_GADGET_SPACE_DISTANCE; ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END); MapDrawingArea(id); } +static void RemoveElementContentArea(int id, int font_height) +{ + int border_size = ED_DRAWINGAREA_BORDER_SIZE; + + DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size, + SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size, + 3 * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size, + 3 * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size + + ED_GADGET_TEXT_DISTANCE + font_height); +} + static void DrawYamYamContentAreas() { - int x = SX + ED_AREA_YAMYAM_CONTENT_X(3) + 4 * MINI_TILEX; - int y = SY + ED_AREA_YAMYAM_CONTENT_Y(0) + ED_BORDER_AREA_YSIZE; + int font_nr = FONT_TEXT_1; + int font_height = getFontHeight(font_nr); + int tilesize = ED_DRAWINGAREA_TILE_SIZE; + int yoffset = (tilesize - font_height) / 2; + int x = SX + ED_AREA_YAMYAM_CONTENT_X(3) + 4 * tilesize; + int y = SY + ED_AREA_YAMYAM_CONTENT_Y(3) + yoffset; int i; /* display counter to choose number of element content areas */ @@ -8117,29 +8288,26 @@ static void DrawYamYamContentAreas() } else { - int font_height = getFontHeight(FONT_TEXT_1); - UnmapDrawingArea(id); /* delete content areas in case of reducing number of them */ - DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - - MINI_TILEX / 2, - SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - - MINI_TILEY / 2, - 4 * MINI_TILEX, - 4 * MINI_TILEY + ED_GADGET_TEXT_DISTANCE + font_height); + RemoveElementContentArea(id, font_height); } } - DrawText(x, y + 0 * MINI_TILEY, "content", FONT_TEXT_1); - DrawText(x, y + 1 * MINI_TILEY, "when", FONT_TEXT_1); - DrawText(x, y + 2 * MINI_TILEY, "smashed", FONT_TEXT_1); + DrawText(x, y + 0 * tilesize, "content", font_nr); + DrawText(x, y + 1 * tilesize, "when", font_nr); + DrawText(x, y + 2 * tilesize, "smashed", font_nr); } static void DrawMagicBallContentAreas() { - int x = SX + ED_AREA_MAGIC_BALL_CONTENT_X(3) + 4 * MINI_TILEX; - int y = SY + ED_AREA_MAGIC_BALL_CONTENT_Y(0) + ED_BORDER_AREA_YSIZE; + int font_nr = FONT_TEXT_1; + int font_height = getFontHeight(font_nr); + int tilesize = ED_DRAWINGAREA_TILE_SIZE; + int yoffset = (tilesize - font_height) / 2; + int x = SX + ED_AREA_MAGIC_BALL_CONTENT_X(3) + 4 * tilesize; + int y = SY + ED_AREA_MAGIC_BALL_CONTENT_Y(3) + yoffset; int i; /* display counter to choose number of element content areas */ @@ -8155,31 +8323,25 @@ static void DrawMagicBallContentAreas() } else { - int font_height = getFontHeight(FONT_TEXT_1); - UnmapDrawingArea(id); /* delete content areas in case of reducing number of them */ - DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - - MINI_TILEX / 2, - SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - - MINI_TILEY / 2, - 4 * MINI_TILEX, - 4 * MINI_TILEY + ED_GADGET_TEXT_DISTANCE + font_height); + RemoveElementContentArea(id, font_height); } } - DrawText(x, y + 0 * MINI_TILEY, "generated", FONT_TEXT_1); - DrawText(x, y + 1 * MINI_TILEY, "when", FONT_TEXT_1); - DrawText(x, y + 2 * MINI_TILEY, "active", FONT_TEXT_1); + DrawText(x, y + 0 * tilesize, "generated", font_nr); + DrawText(x, y + 1 * tilesize, "when", font_nr); + DrawText(x, y + 2 * tilesize, "active", font_nr); } static void DrawAndroidElementArea(int element) { - int num_elements = level.num_android_clone_elements; int id = ED_DRAWING_ID_ANDROID_CONTENT; - int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - MINI_TILEX / 2; - int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - MINI_TILEY / 2; + int num_elements = level.num_android_clone_elements; + int border_size = ED_DRAWINGAREA_BORDER_SIZE; + int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size; + int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size; int xsize = MAX_ANDROID_ELEMENTS; int ysize = 1; @@ -8194,19 +8356,20 @@ static void DrawAndroidElementArea(int element) ModifyEditorDrawingArea(id, num_elements, 1); /* delete content areas in case of reducing number of them */ - DrawBackground(sx, sy, (xsize + 1) * MINI_TILEX, (ysize + 1) * MINI_TILEY); + DrawBackground(sx, sy, + xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size, + ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size); MapDrawingArea(id); } static void DrawGroupElementArea(int element) { - int num_elements = group_element_info.num_elements; int id = ED_DRAWING_ID_GROUP_CONTENT; - int bx = ED_ELEMENT_BORDER_INPUT; - int by = ED_ELEMENT_BORDER_INPUT; - int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - bx; - int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - by; + int num_elements = group_element_info.num_elements; + int border_size = ED_DRAWINGAREA_BORDER_SIZE; + int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size; + int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size; int xsize = MAX_ELEMENTS_IN_GROUP; int ysize = 1; @@ -8218,25 +8381,28 @@ static void DrawGroupElementArea(int element) ModifyEditorDrawingArea(id, num_elements, 1); /* delete content areas in case of reducing number of them */ - DrawBackground(sx, sy, xsize * MINI_TILEX + 2*bx, ysize * MINI_TILEY + 2*by); + DrawBackground(sx, sy, + xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size, + ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size); MapDrawingArea(id); } static void DrawPlayerInitialInventoryArea(int element) { + int id = ED_DRAWING_ID_INVENTORY_CONTENT; int player_nr = GET_PLAYER_NR(element); int num_elements = level.initial_inventory_size[player_nr]; - int id = ED_DRAWING_ID_INVENTORY_CONTENT; - int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - MINI_TILEX / 2; - int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - MINI_TILEY / 2; + int border_size = ED_DRAWINGAREA_BORDER_SIZE; + int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size; + int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size; int xsize = MAX_INITIAL_INVENTORY_SIZE; int ysize = 1; /* determine horizontal position to the right of specified gadget */ if (drawingarea_info[id].gadget_id_align != GADGET_ID_NONE) - sx += (right_gadget_border[drawingarea_info[id].gadget_id_align] + - ED_DRAWINGAREA_TEXT_DISTANCE); + sx = (right_gadget_border[drawingarea_info[id].gadget_id_align] + + ED_DRAWINGAREA_TEXT_DISTANCE); /* determine horizontal offset for leading text */ if (drawingarea_info[id].text_left != NULL) @@ -8247,7 +8413,9 @@ static void DrawPlayerInitialInventoryArea(int element) ModifyEditorDrawingArea(id, num_elements, 1); /* delete content areas in case of reducing number of them */ - DrawBackground(sx, sy, (xsize + 1) * MINI_TILEX, (ysize + 1) * MINI_TILEY); + DrawBackground(sx, sy, + xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size, + ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size); MapDrawingArea(id); } @@ -8275,7 +8443,7 @@ static boolean PrintInfoText(char *text, int font_nr, int start_line) { int font_height = getFontHeight(font_nr); int pad_x = ED_ELEMENT_SETTINGS_X(0); - int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE; + int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE; int sx = SX + pad_x; int sy = SY + pad_y; int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1; @@ -8294,7 +8462,7 @@ static int PrintElementDescriptionFromFile(char *filename, int start_line) int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); int pad_x = ED_ELEMENT_SETTINGS_X(0); - int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE; + int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE; int sx = SX + pad_x; int sy = SY + pad_y + start_line * font_height; int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width; @@ -8379,7 +8547,7 @@ static void DrawPropertiesInfo() int font1_width = getFontWidth(font1_nr); int font2_height = getFontHeight(font2_nr); int pad_x = ED_ELEMENT_SETTINGS_X(0); - int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE; + int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE; int screen_line = 0; int i, x, y; @@ -8699,6 +8867,7 @@ static void DrawPropertiesConfig() MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INSTANT_RELOCATION); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SHIFTED_RELOCATION); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_LAZY_RELOCATION); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_START_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT); @@ -8899,7 +9068,8 @@ static void DrawPropertiesConfig() if (tab_color != BLACK_PIXEL) /* black => transparent */ FillRectangle(drawto, SX + ED_ELEMENT_SETTINGS_X(0), - SY + ED_ELEMENT_SETTINGS_Y(14) - MINI_TILEY / 2, + SY + ED_ELEMENT_SETTINGS_Y(14) - ED_SETTINGS_TABS_YOFFSET - + ED_TAB_BAR_HEIGHT, getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color); } } @@ -9014,6 +9184,25 @@ static void DrawEditorElementName(int x, int y, int font_nr) static void DrawPropertiesWindow() { + struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT]; + int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size; + int border_size = gd->border_size; + int font_nr = FONT_TEXT_1; + int font_height = getFontHeight(font_nr); + int xoffset = TILEX + element_border + 3 * border_size; + int yoffset = (TILEY - font_height) / 2; + int x1 = editor.settings.element_graphic.x + element_border; + int y1 = editor.settings.element_graphic.y + element_border; + int x2 = (editor.settings.element_name.x == -1 ? x1 + xoffset : + editor.settings.element_name.x); + int y2 = (editor.settings.element_name.y == -1 ? y1 + yoffset : + editor.settings.element_name.y); + char *text = "Element Settings"; + int font2_nr = FONT_TITLE_1; + struct MenuPosInfo *pos = &editor.settings.headline; + int sx = SX + ALIGNED_XPOS(pos->x, getTextWidth(text, font2_nr), pos->align); + int sy = SY + pos->y; + stick_element_properties_window = FALSE; /* make sure that previous properties edit mode exists for this element */ @@ -9044,22 +9233,13 @@ static void DrawPropertiesWindow() SetMainBackgroundImage(IMG_BACKGROUND_EDITOR); ClearField(); - DrawTextSCentered(ED_SETTINGS1_YPOS, FONT_TITLE_1, "Element Settings"); + DrawText(sx, sy, text, font2_nr); FrameCounter = 0; /* restart animation frame counter */ - struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT]; - int border_size = gd->border_size; - int font_nr = FONT_TEXT_1; - int font_height = getFontHeight(font_nr); - int x = ED_ELEMENT_SETTINGS_ELEM_XPOS; - int y = ED_ELEMENT_SETTINGS_ELEM_YPOS; - int xoffset = TILEX + ED_ELEMENT_BORDER + 3 * border_size; - int yoffset = (TILEY - font_height) / 2; - - DrawElementBorder(SX + x, SY + y, TILEX, TILEY, FALSE); - DrawEditorElementAnimation(SX + x, SY + y); - DrawEditorElementName(x + xoffset, y + yoffset, font_nr); + DrawElementBorder(SX + x1, SY + y1, TILEX, TILEY, FALSE); + DrawEditorElementAnimation(SX + x1, SY + y1); + DrawEditorElementName(x2, y2, font_nr); DrawPropertiesTabulatorGadgets(); @@ -10832,7 +11012,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) DrawFixedGraphicExt(drawto, gi->x + sx * TILEX, gi->y + sy * TILEY, - el2img(new_element), 0); + el2edimg(new_element), 0); if (id == GADGET_ID_CUSTOM_GRAPHIC) new_element = GFX_ELEMENT(new_element); @@ -11295,6 +11475,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) int button = gi->event.button; int step = BUTTON_STEPSIZE(button); int new_element = BUTTON_ELEMENT(button); + int last_properties_element = properties_element; int x, y; if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT) @@ -11395,12 +11576,18 @@ static void HandleControlButtons(struct GadgetInfo *gi) case GADGET_ID_SCROLL_HORIZONTAL: level_xpos = gi->event.item_position - 1; + DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); + BackToFront(); + break; case GADGET_ID_SCROLL_VERTICAL: level_ypos = gi->event.item_position - 1; + DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos); + BackToFront(); + break; case GADGET_ID_SCROLL_LIST_UP: @@ -11428,9 +11615,19 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; case GADGET_ID_PROPERTIES: - if (edit_mode != ED_MODE_PROPERTIES) + // always switch off element properties when they are already displayed + last_properties_element = new_element; + case GADGET_ID_ELEMENT_LEFT: + case GADGET_ID_ELEMENT_MIDDLE: + case GADGET_ID_ELEMENT_RIGHT: + properties_element = (id == GADGET_ID_ELEMENT_LEFT ? new_element1 : + id == GADGET_ID_ELEMENT_MIDDLE ? new_element2 : + id == GADGET_ID_ELEMENT_RIGHT ? new_element3 : + new_element); + + if (edit_mode != ED_MODE_PROPERTIES || + properties_element != last_properties_element) { - properties_element = new_element; DrawPropertiesWindow(); edit_mode = ED_MODE_PROPERTIES; @@ -11782,6 +11979,7 @@ void HandleLevelEditorKeyInput(Key key) { int id = GADGET_ID_NONE; int new_element_shift = element_shift; + int step = ED_ELEMENTLIST_BUTTONS_VERT - 1; int i; switch (key) @@ -11798,13 +11996,23 @@ void HandleLevelEditorKeyInput(Key key) case KSYM_Down: id = GADGET_ID_SCROLL_DOWN; break; + case KSYM_Page_Up: - id = GADGET_ID_SCROLL_LIST_UP; - button = ED_ELEMENTLIST_BUTTONS_VERT - 1; - break; case KSYM_Page_Down: - id = GADGET_ID_SCROLL_LIST_DOWN; - button = ED_ELEMENTLIST_BUTTONS_VERT - 1; + step *= (key == KSYM_Page_Up ? -1 : +1); + element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ; + + 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; + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, + element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END); + + ModifyEditorElementList(); + break; case KSYM_Home: @@ -11888,12 +12096,13 @@ void HandleLevelEditorKeyInput(Key key) ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button); else if (letter == 'U') ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3); - else if (key == KSYM_KP_Subtract) - ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1); - else if (key == KSYM_KP_0 || letter == '0') - ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2); - else if (key == KSYM_KP_Add || letter == '+') + 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) @@ -11908,9 +12117,11 @@ void HandleLevelEditorKeyInput(Key key) void HandleLevelEditorIdle() { + int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size; + int x = editor.settings.element_graphic.x + element_border; + int y = editor.settings.element_graphic.y + element_border; static unsigned int action_delay = 0; unsigned int action_delay_value = GameFrameDelay; - int xpos = 1, ypos = 2; int i; if (edit_mode != ED_MODE_PROPERTIES) @@ -11927,11 +12138,9 @@ void HandleLevelEditorIdle() return; } - DrawEditorElementAnimation(SX + xpos * TILEX, - SY + ypos * TILEY + MINI_TILEY / 2); + DrawEditorElementAnimation(SX + x, SY + y); - MarkTileDirty(xpos, ypos); - MarkTileDirty(xpos, ypos + 1); + redraw_mask |= REDRAW_FIELD; FrameCounter++; /* increase animation frame counter */ } @@ -11947,7 +12156,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi) char shortcut[MAX_OUTPUT_LINESIZE + 1]; int max_infotext_len = getMaxInfoTextLength(); - if (gi == NULL || gi->info_text == NULL) + if (gi == NULL || strlen(gi->info_text) == 0) return; strncpy(infotext, gi->info_text, max_infotext_len); @@ -11978,7 +12187,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi) } } - DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_TEXT_2); + DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, INFOTEXT_FONT); } void HandleEditorGadgetInfoText(void *ptr) @@ -12151,7 +12360,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) infotext[max_infotext_len] = '\0'; if (strlen(infotext) > 0) - DrawTextS(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, infotext); + DrawTextS(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, INFOTEXT_FONT, infotext); } void RequestExitLevelEditor(boolean ask_if_level_has_changed, @@ -12162,14 +12371,33 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed, Request("Level has changed! Exit without saving?", REQ_ASK | REQ_STAY_OPEN)) { - SetDoorState(DOOR_CLOSE_2); + struct RectWithBorder *vp_door_1 = &viewport.door_1[GAME_MODE_MAIN]; + struct RectWithBorder *vp_door_2 = &viewport.door_2[GAME_MODE_MAIN]; + + /* draw normal door */ + UndrawSpecialEditorDoor(); + + // close editor doors if viewport definition is the same as in main menu + if (vp_door_1->x == DX && + vp_door_1->y == DY && + vp_door_1->width == DXSIZE && + vp_door_1->height == DYSIZE && + vp_door_2->x == VX && + vp_door_2->y == VY && + vp_door_2->width == VXSIZE && + vp_door_2->height == VYSIZE) + CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); + else + SetDoorState(DOOR_CLOSE_2); + + BackToFront(); if (quick_quit) FadeSkipNextFadeIn(); - game_status = GAME_MODE_MAIN; + SetGameStatus(GAME_MODE_MAIN); - DrawAndFadeInMainMenu(playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD); + DrawMainMenu(); } else {