#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 66)
/* some positions in the editor control window */
-#define ED_BUTTON_ELEM_XPOS 6
-#define ED_BUTTON_ELEM_YPOS 30
-#define ED_BUTTON_ELEM_XSIZE 22
-#define ED_BUTTON_ELEM_YSIZE 22
-
-/* some values for text input and counter gadgets */
-#define ED_BUTTON_COUNT_YPOS 60
-#define ED_BUTTON_COUNT_XSIZE 20
-#define ED_BUTTON_COUNT_YSIZE 20
-#define ED_WIN_COUNT_XPOS (2 + ED_BUTTON_COUNT_XSIZE + 2)
-#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_WIN_COUNT_XSIZE 52
-#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE
-#define ED_WIN_COUNT2_XPOS 27
-#define ED_WIN_COUNT2_YPOS 3
-#define ED_WIN_COUNT2_XSIZE 46
-#define ED_WIN_COUNT2_YSIZE ED_BUTTON_COUNT_YSIZE
-
-#define ED_BUTTON_MINUS_XPOS 2
-#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE
-#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE
-#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2)
-#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE
-#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_BUTTON_ELEM_XPOS 6
+#define ED_BUTTON_ELEM_YPOS 30
+#define ED_BUTTON_ELEM_XSIZE 22
+#define ED_BUTTON_ELEM_YSIZE 22
+
+/* some values for text input, selectbox and counter gadgets */
+#define ED_BUTTON_COUNT_YPOS 60
+#define ED_BUTTON_COUNT_XSIZE 20
+#define ED_BUTTON_COUNT_YSIZE 20
+#define ED_WIN_COUNT_XPOS (2 + ED_BUTTON_COUNT_XSIZE + 2)
+#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_WIN_COUNT_XSIZE 52
+#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_WIN_COUNT2_XPOS 27
+#define ED_WIN_COUNT2_YPOS 3
+#define ED_WIN_COUNT2_XSIZE 46
+#define ED_WIN_COUNT2_YSIZE ED_BUTTON_COUNT_YSIZE
+
+#define ED_BUTTON_MINUS_XPOS 2
+#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS + \
+ ED_WIN_COUNT_XSIZE + 2)
+#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE
+
+#define ED_SELECTBOX_XPOS ED_WIN_COUNT_XPOS
+#define ED_SELECTBOX_YPOS (ED_WIN_COUNT_YPOS + 2 + \
+ ED_WIN_COUNT_YSIZE)
+#define ED_SELECTBOX_XSIZE ED_WIN_COUNT_XSIZE
+#define ED_SELECTBOX_YSIZE ED_WIN_COUNT_YSIZE
/* editor gadget identifiers */
#define GADGET_ID_LEVEL_NAME 60
#define GADGET_ID_LEVEL_AUTHOR 61
+/* selectbox identifiers */
+#define GADGET_ID_SELECTBOX_TEST 62
+
/* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLL_UP 62
-#define GADGET_ID_SCROLL_DOWN 63
-#define GADGET_ID_SCROLL_LEFT 64
-#define GADGET_ID_SCROLL_RIGHT 65
-#define GADGET_ID_SCROLL_HORIZONTAL 66
-#define GADGET_ID_SCROLL_VERTICAL 67
+#define GADGET_ID_SCROLL_UP 63
+#define GADGET_ID_SCROLL_DOWN 64
+#define GADGET_ID_SCROLL_LEFT 65
+#define GADGET_ID_SCROLL_RIGHT 66
+#define GADGET_ID_SCROLL_HORIZONTAL 67
+#define GADGET_ID_SCROLL_VERTICAL 68
/* gadgets for scrolling element list */
-#define GADGET_ID_SCROLL_LIST_UP 68
-#define GADGET_ID_SCROLL_LIST_DOWN 69
-#define GADGET_ID_SCROLL_LIST_VERTICAL 70
+#define GADGET_ID_SCROLL_LIST_UP 69
+#define GADGET_ID_SCROLL_LIST_DOWN 70
+#define GADGET_ID_SCROLL_LIST_VERTICAL 71
/* buttons for level/element properties */
-#define GADGET_ID_RANDOM_PERCENTAGE 71
-#define GADGET_ID_RANDOM_QUANTITY 72
-#define GADGET_ID_RANDOM_RESTRICTED 73
-#define GADGET_ID_DOUBLE_SPEED 74
-#define GADGET_ID_GRAVITY 75
-#define GADGET_ID_STICK_ELEMENT 76
-#define GADGET_ID_EM_SLIPPERY_GEMS 77
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE 78
-#define GADGET_ID_CUSTOM_CAN_FALL 79
-#define GADGET_ID_CUSTOM_CAN_SMASH 80
-#define GADGET_ID_CUSTOM_PUSHABLE 81
-#define GADGET_ID_CUSTOM_SLIPPERY 82
+#define GADGET_ID_RANDOM_PERCENTAGE 72
+#define GADGET_ID_RANDOM_QUANTITY 73
+#define GADGET_ID_RANDOM_RESTRICTED 74
+#define GADGET_ID_DOUBLE_SPEED 75
+#define GADGET_ID_GRAVITY 76
+#define GADGET_ID_STICK_ELEMENT 77
+#define GADGET_ID_EM_SLIPPERY_GEMS 78
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE 79
+#define GADGET_ID_CUSTOM_CAN_FALL 80
+#define GADGET_ID_CUSTOM_CAN_SMASH 81
+#define GADGET_ID_CUSTOM_PUSHABLE 82
+#define GADGET_ID_CUSTOM_SLIPPERY 83
/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST 83
+#define GADGET_ID_ELEMENTLIST_FIRST 84
#define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \
ED_NUM_ELEMENTLIST_BUTTONS - 1)
#define ED_TEXTINPUT_ID_LEVEL_FIRST ED_TEXTINPUT_ID_LEVEL_NAME
#define ED_TEXTINPUT_ID_LEVEL_LAST ED_TEXTINPUT_ID_LEVEL_AUTHOR
+/* values for selectbox gadgets */
+#define ED_SELECTBOX_ID_TEST 0
+
+#define ED_NUM_SELECTBOX 1
+
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0
#define ED_CHECKBUTTON_ID_GRAVITY 1
}
};
+static char *test_values[] =
+{
+ "test 1",
+ "test 2",
+ "dieser test-text ist viel zu lang fuer die selectbox",
+ "letzter text",
+ NULL
+};
+static int test_index = 0;
+
+static struct
+{
+ int x, y;
+ int gadget_id;
+ int size;
+ char **values;
+ int *index;
+ char *text, *infotext;
+} selectbox_info[ED_NUM_SELECTBOX] =
+{
+ {
+ ED_SETTINGS_XPOS, ED_COUNTER_YPOS(3),
+ GADGET_ID_SELECTBOX_TEST,
+ MAX_PLAYER_NAME_LEN,
+ test_values, &test_index,
+ "test:", "test-selectbox entry"
+ },
+};
+
static struct
{
int xpos, ypos;
static void HandleDrawingAreas(struct GadgetInfo *);
static void HandleCounterButtons(struct GadgetInfo *);
static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleSelectboxGadgets(struct GadgetInfo *);
static void HandleRadiobuttons(struct GadgetInfo *);
static void HandleCheckbuttons(struct GadgetInfo *);
static void HandleControlButtons(struct GadgetInfo *);
EL_CHAR('S'),
EL_CHAR('H'),
- EL_PLAYER1,
+ EL_PLAYER_1,
EL_EMPTY,
EL_SAND,
EL_STEELWALL,
EL_CHAR('N'),
EL_CHAR('E'),
- EL_PLAYER1,
- EL_PLAYER2,
- EL_PLAYER3,
- EL_PLAYER4,
+ EL_PLAYER_1,
+ EL_PLAYER_2,
+ EL_PLAYER_3,
+ EL_PLAYER_4,
- EL_PLAYER1,
+ EL_PLAYER_1,
EL_EMPTY,
EL_SAND,
EL_ROCK,
EL_SPACESHIP_DOWN,
EL_INVISIBLE_WALL,
- EL_ACIDPOOL_TOPLEFT,
+ EL_ACID_POOL_TOPLEFT,
EL_ACID,
- EL_ACIDPOOL_TOPRIGHT,
+ EL_ACID_POOL_TOPRIGHT,
EL_EMPTY,
- EL_ACIDPOOL_BOTTOMLEFT,
- EL_ACIDPOOL_BOTTOM,
- EL_ACIDPOOL_BOTTOMRIGHT,
+ EL_ACID_POOL_BOTTOMLEFT,
+ EL_ACID_POOL_BOTTOM,
+ EL_ACID_POOL_BOTTOMRIGHT,
EL_EMPTY,
EL_AMOEBA_DROP,
EL_AMOEBA_WET,
EL_AMOEBA_DRY,
- EL_EM_KEY1_FILE,
- EL_EM_KEY2_FILE,
- EL_EM_KEY3_FILE,
- EL_EM_KEY4_FILE,
+ EL_EM_KEY_1_FILE,
+ EL_EM_KEY_2_FILE,
+ EL_EM_KEY_3_FILE,
+ EL_EM_KEY_4_FILE,
- EL_EM_GATE1,
- EL_EM_GATE2,
- EL_EM_GATE3,
- EL_EM_GATE4,
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
- EL_EM_GATE1_GRAY,
- EL_EM_GATE2_GRAY,
- EL_EM_GATE3_GRAY,
- EL_EM_GATE4_GRAY,
+ EL_EM_GATE_1_GRAY,
+ EL_EM_GATE_2_GRAY,
+ EL_EM_GATE_3_GRAY,
+ EL_EM_GATE_4_GRAY,
};
static int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
EL_CHAR('R'),
EL_CHAR('E'),
- EL_KEY1,
- EL_KEY2,
- EL_KEY3,
- EL_KEY4,
+ EL_KEY_1,
+ EL_KEY_2,
+ EL_KEY_3,
+ EL_KEY_4,
- EL_GATE1,
- EL_GATE2,
- EL_GATE3,
- EL_GATE4,
+ EL_GATE_1,
+ EL_GATE_2,
+ EL_GATE_3,
+ EL_GATE_4,
- EL_GATE1_GRAY,
- EL_GATE2_GRAY,
- EL_GATE3_GRAY,
- EL_GATE4_GRAY,
+ EL_GATE_1_GRAY,
+ EL_GATE_2_GRAY,
+ EL_GATE_3_GRAY,
+ EL_GATE_4_GRAY,
EL_ARROW_LEFT,
EL_ARROW_RIGHT,
EL_WALL_EMERALD_RED,
EL_WALL_EMERALD_PURPLE,
- EL_GAMEOFLIFE,
+ EL_GAME_OF_LIFE,
EL_PACMAN_UP,
EL_TIME_ORB_FULL,
EL_TIME_ORB_EMPTY,
EL_PACMAN_LEFT,
EL_DARK_YAMYAM,
EL_PACMAN_RIGHT,
- EL_WALL_GROWING,
+ EL_EXPANDABLE_WALL,
EL_BIOMAZE,
EL_PACMAN_DOWN,
EL_LAMP,
EL_LAMP_ACTIVE,
- EL_DYNABOMB_NR,
- EL_DYNABOMB_SZ,
- EL_DYNABOMB_XL,
+ EL_DYNABOMB_INCREASE_NUMBER,
+ EL_DYNABOMB_INCREASE_SIZE,
+ EL_DYNABOMB_INCREASE_POWER,
EL_STONEBLOCK,
EL_MOLE,
EL_EMPTY,
EL_MOLE_DOWN,
EL_BALLOON,
- EL_BALLOON_SEND_ANY_DIRECTION,
+ EL_BALLOON_SWITCH_ANY,
- EL_BALLOON_SEND_LEFT,
- EL_BALLOON_SEND_RIGHT,
- EL_BALLOON_SEND_UP,
- EL_BALLOON_SEND_DOWN,
+ EL_BALLOON_SWITCH_LEFT,
+ EL_BALLOON_SWITCH_RIGHT,
+ EL_BALLOON_SWITCH_UP,
+ EL_BALLOON_SWITCH_DOWN,
EL_SATELLITE,
- EL_WALL_GROWING_X,
- EL_WALL_GROWING_Y,
- EL_WALL_GROWING_XY,
+ EL_EXPANDABLE_WALL_HORIZONTAL,
+ EL_EXPANDABLE_WALL_VERTICAL,
+ EL_EXPANDABLE_WALL_ANY,
EL_INVISIBLE_STEELWALL,
EL_INVISIBLE_WALL,
EL_SPEED_PILL,
EL_BLACK_ORB,
- EL_EMC_STEELWALL1,
- EL_EMC_WALL_PILLAR_UPPER,
- EL_EMC_WALL_PILLAR_MIDDLE,
- EL_EMC_WALL_PILLAR_LOWER,
+ EL_EMC_STEELWALL_1,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
- EL_EMC_WALL4,
- EL_EMC_WALL5,
- EL_EMC_WALL6,
- EL_EMC_WALL7,
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
};
static int num_editor_el_more = SIZEOF_ARRAY_INT(editor_el_more);
EL_SP_INFOTRON,
EL_SP_CHIP_SINGLE,
- EL_SP_HARD_GRAY,
+ EL_SP_HARDWARE_GRAY,
EL_SP_EXIT_CLOSED,
EL_SP_DISK_ORANGE,
- EL_SP_PORT1_RIGHT,
- EL_SP_PORT1_DOWN,
- EL_SP_PORT1_LEFT,
+ EL_SP_PORT_RIGHT,
+ EL_SP_PORT_DOWN,
+ EL_SP_PORT_LEFT,
- EL_SP_PORT1_UP,
- EL_SP_PORT2_RIGHT,
- EL_SP_PORT2_DOWN,
- EL_SP_PORT2_LEFT,
+ EL_SP_PORT_UP,
+ EL_SP_GRAVITY_PORT_RIGHT,
+ EL_SP_GRAVITY_PORT_DOWN,
+ EL_SP_GRAVITY_PORT_LEFT,
- EL_SP_PORT2_UP,
+ EL_SP_GRAVITY_PORT_UP,
EL_SP_SNIKSNAK,
EL_SP_DISK_YELLOW,
EL_SP_TERMINAL,
EL_SP_DISK_RED,
- EL_SP_PORT_Y,
- EL_SP_PORT_X,
- EL_SP_PORT_XY,
+ EL_SP_PORT_VERTICAL,
+ EL_SP_PORT_HORIZONTAL,
+ EL_SP_PORT_ANY,
EL_SP_ELECTRON,
EL_SP_BUGGY_BASE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
- EL_SP_HARD_BASE1,
- EL_SP_HARD_GREEN,
- EL_SP_HARD_BLUE,
- EL_SP_HARD_RED,
+ EL_SP_HARDWARE_BASE_1,
+ EL_SP_HARDWARE_GREEN,
+ EL_SP_HARDWARE_BLUE,
+ EL_SP_HARDWARE_RED,
- EL_SP_HARD_YELLOW,
- EL_SP_HARD_BASE2,
- EL_SP_HARD_BASE3,
- EL_SP_HARD_BASE4,
+ EL_SP_HARDWARE_YELLOW,
+ EL_SP_HARDWARE_BASE_2,
+ EL_SP_HARDWARE_BASE_3,
+ EL_SP_HARDWARE_BASE_4,
- EL_SP_HARD_BASE5,
- EL_SP_HARD_BASE6,
- EL_SP_CHIP_UPPER,
- EL_SP_CHIP_LOWER,
+ EL_SP_HARDWARE_BASE_5,
+ EL_SP_HARDWARE_BASE_6,
+ EL_SP_CHIP_TOP,
+ EL_SP_CHIP_BOTTOM,
};
static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
EL_WALL_PEARL,
EL_WALL_CRYSTAL,
- EL_CONVEYOR_BELT1_LEFT,
- EL_CONVEYOR_BELT1_MIDDLE,
- EL_CONVEYOR_BELT1_RIGHT,
- EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+ EL_CONVEYOR_BELT_1_LEFT,
+ EL_CONVEYOR_BELT_1_MIDDLE,
+ EL_CONVEYOR_BELT_1_RIGHT,
+ EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
- EL_CONVEYOR_BELT2_LEFT,
- EL_CONVEYOR_BELT2_MIDDLE,
- EL_CONVEYOR_BELT2_RIGHT,
- EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+ EL_CONVEYOR_BELT_2_LEFT,
+ EL_CONVEYOR_BELT_2_MIDDLE,
+ EL_CONVEYOR_BELT_2_RIGHT,
+ EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
- EL_CONVEYOR_BELT3_LEFT,
- EL_CONVEYOR_BELT3_MIDDLE,
- EL_CONVEYOR_BELT3_RIGHT,
- EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+ EL_CONVEYOR_BELT_3_LEFT,
+ EL_CONVEYOR_BELT_3_MIDDLE,
+ EL_CONVEYOR_BELT_3_RIGHT,
+ EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
- EL_CONVEYOR_BELT4_LEFT,
- EL_CONVEYOR_BELT4_MIDDLE,
- EL_CONVEYOR_BELT4_RIGHT,
- EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+ EL_CONVEYOR_BELT_4_LEFT,
+ EL_CONVEYOR_BELT_4_MIDDLE,
+ EL_CONVEYOR_BELT_4_RIGHT,
+ EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
- EL_CONVEYOR_BELT1_SWITCH_LEFT,
- EL_CONVEYOR_BELT2_SWITCH_LEFT,
- EL_CONVEYOR_BELT3_SWITCH_LEFT,
- EL_CONVEYOR_BELT4_SWITCH_LEFT,
+ EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+ EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+ EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+ EL_CONVEYOR_BELT_4_SWITCH_LEFT,
- EL_CONVEYOR_BELT1_SWITCH_RIGHT,
- EL_CONVEYOR_BELT2_SWITCH_RIGHT,
- EL_CONVEYOR_BELT3_SWITCH_RIGHT,
- EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+ EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+ EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+ EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+ EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
EL_SWITCHGATE_OPEN,
EL_SWITCHGATE_CLOSED,
EL_TUBE_HORIZONTAL,
EL_TUBE_VERTICAL_RIGHT,
- EL_TUBE_ALL,
+ EL_TUBE_ANY,
EL_TUBE_VERTICAL_LEFT,
EL_TUBE_VERTICAL,
static int getCounterGadgetWidth()
{
- return (DXSIZE + getFontWidth(FONT_DEFAULT_SMALL) - 2 * ED_GADGET_DISTANCE);
+ return (DXSIZE + getFontWidth(FONT_INPUT) - 2 * ED_GADGET_DISTANCE);
}
static int getMaxInfoTextLength()
{
- return (SXSIZE / getFontWidth(FONT_DEFAULT_SMALL));
+ return (SXSIZE / getFontWidth(FONT_TEXT_2));
}
static char *getElementInfoText(int element)
if (j == 0)
{
- int font_type = FONT_DEFAULT_SMALL;
+ int font_type = FONT_INPUT;
int gd_width = ED_WIN_COUNT_XSIZE;
id = counterbutton_info[i].gadget_id_text;
if (i == ED_COUNTER_ID_SELECT_LEVEL)
{
- font_type = FONT_SPECIAL_NARROW;
+ font_type = FONT_LEVEL_NUMBER;
xpos += 2 * ED_GADGET_DISTANCE;
ypos -= ED_GADGET_DISTANCE;
GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
GDI_TEXT_VALUE, textinput_info[i].value,
GDI_TEXT_SIZE, textinput_info[i].size,
- GDI_TEXT_FONT, FONT_DEFAULT_SMALL,
+ GDI_TEXT_FONT, FONT_INPUT,
GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
GDI_BORDER_SIZE, ED_BORDER_SIZE,
}
}
+static void CreateSelectboxGadgets()
+{
+ int max_infotext_len = getMaxInfoTextLength();
+ int i;
+
+ for (i=0; i<ED_NUM_SELECTBOX; i++)
+ {
+ Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+ int gd_x, gd_y;
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
+ char infotext[MAX_OUTPUT_LINESIZE + 1];
+ int id = selectbox_info[i].gadget_id;
+
+ event_mask = GD_EVENT_RELEASED |
+ GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+ gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
+
+ sprintf(infotext, "Select %s", selectbox_info[i].infotext);
+ infotext[max_infotext_len] = '\0';
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_INFO_TEXT, infotext,
+ GDI_X, SX + selectbox_info[i].x,
+ GDI_Y, SY + selectbox_info[i].y,
+ GDI_TYPE, GD_TYPE_SELECTBOX,
+ GDI_SELECTBOX_VALUES, selectbox_info[i].values,
+ GDI_SELECTBOX_INDEX, selectbox_info[i].index,
+ GDI_TEXT_SIZE, selectbox_info[i].size,
+ GDI_TEXT_FONT, FONT_INPUT,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
+ GDI_BORDER_SIZE_SELECTBUTTON, getFontHeight(FONT_INPUT),
+ GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+ GDI_CALLBACK_ACTION, HandleSelectboxGadgets,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[id] = gi;
+ }
+}
+
static void CreateScrollbarGadgets()
{
int i;
CreateCounterButtons();
CreateDrawingAreas();
CreateTextInputGadgets();
+ CreateSelectboxGadgets();
CreateScrollbarGadgets();
CreateCheckbuttonGadgets();
}
MapGadget(level_editor_gadget[textinput_info[id].gadget_id]);
}
+static void MapSelectboxGadget(int id)
+{
+ MapGadget(level_editor_gadget[selectbox_info[id].gadget_id]);
+}
+
static void MapRadiobuttonGadget(int id)
{
MapGadget(level_editor_gadget[radiobutton_info[id].gadget_id]);
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == EL_PLAYER1 ||
+ if (Feld[x][y] == EL_PLAYER_1 ||
Feld[x][y] == EL_SP_MURPHY)
player_found = TRUE;
static void DrawElementBorder(int dest_x, int dest_y, int width, int height)
{
- int border_graphic = IMG_SAND;
+ int border_graphic = IMG_EDITOR_ELEMENT_BORDER;
Bitmap *src_bitmap;
int src_x, src_y;
int num_mini_tilex = width / MINI_TILEX + 1;
int yoffset_right = ED_BORDER_SIZE;
int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
int yoffset_right2 = ED_BORDER_SIZE;
- int font_color = FONT(FS_SMALL, FC_GREEN);
int i, x, y;
SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
UnmapLevelEditorWindowGadgets();
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
- "Level Settings", FONT_DEFAULT_BIG);
+ "Level Settings", FONT_TITLE_1);
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
- "Editor Settings", FONT_DEFAULT_BIG);
+ "Editor Settings", FONT_TITLE_1);
/* draw counter gadgets */
for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
sprintf(infotext, "%s:", counterbutton_info[i].infotext_above);
infotext[max_infotext_len] = '\0';
- DrawTextF(x, y, font_color, infotext);
+ DrawTextF(x, y, FONT_TEXT_1, infotext);
}
if (counterbutton_info[i].infotext_right)
sprintf(infotext, "%s", counterbutton_info[i].infotext_right);
infotext[max_infotext_len] = '\0';
- DrawTextF(x, y, font_color, infotext);
+ DrawTextF(x, y, FONT_TEXT_1, infotext);
}
ModifyEditorCounter(i, *counterbutton_info[i].value);
sprintf(infotext, "%s:", textinput_info[i].infotext);
infotext[max_infotext_len] = '\0';
- DrawTextF(x, y, font_color, infotext);
+ DrawTextF(x, y, FONT_TEXT_1, infotext);
ModifyEditorTextInput(i, textinput_info[i].value);
MapTextInputGadget(i);
}
x = radiobutton_info[i].x + xoffset_right2;
y = radiobutton_info[i].y + yoffset_right2;
- DrawTextF(x, y, font_color, radiobutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, radiobutton_info[i].text);
ModifyGadget(level_editor_gadget[radiobutton_info[i].gadget_id],
GDI_CHECKED, checked, GDI_END);
MapRadiobuttonGadget(i);
x = checkbutton_info[i].x + xoffset_right2;
y = checkbutton_info[i].y + yoffset_right2;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
- int font_color = FONT(FS_SMALL, FC_GREEN);
ElementContent[0][0][0] = level.amoeba_content;
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
- DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", font_color);
+ DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1);
MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
}
int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
int xoffset_right = getCounterGadgetWidth();
int yoffset_right = ED_BORDER_SIZE;
- int font_color = FONT(FS_SMALL, FC_GREEN);
int i, x, y;
for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
/* display counter to choose number of element content areas */
x = counterbutton_info[counter_id].x + xoffset_right;
y = counterbutton_info[counter_id].y + yoffset_right;
- DrawTextF(x, y, font_color, "number of content areas");
+ DrawTextF(x, y, FONT_TEXT_1, "number of content areas");
ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
MapCounterButtons(counter_id);
3 * MINI_TILEX, 3 * MINI_TILEY);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
- "Content", font_color);
+ "Content", FONT_TEXT_1);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 1 * MINI_TILEY + 1,
- "when", font_color);
+ "when", FONT_TEXT_1);
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
- "smashed", font_color);
+ "smashed", FONT_TEXT_1);
for (i=0; i<level.num_yam_contents; i++)
{
DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
area_sy - SY + 6 * (i / 4) * MINI_TILEY + 4 * MINI_TILEY - 4,
- font_color, "%d", i + 1);
+ FONT_TEXT_1, "%d", i + 1);
}
for (i=0; i<level.num_yam_contents; i++)
int yoffset_right2 = ED_BORDER_SIZE;
int xstart = 2;
int ystart = 4;
- int font_color = FONT(FS_SMALL, FC_GREEN);
int i, x, y;
static struct
{
{ EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING },
{ EL_NUT, &level.score[SC_KOKOSNUSS], TEXT_CRACKING },
{ EL_DYNAMITE, &level.score[SC_DYNAMIT], TEXT_COLLECTING },
- { EL_KEY1, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_KEY2, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_KEY3, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_KEY4, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_EM_KEY1_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_EM_KEY2_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_EM_KEY3_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
- { EL_EM_KEY4_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_KEY_1, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_KEY_2, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_KEY_3, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_KEY_4, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_1_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_2_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_3_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_4_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
{ EL_AMOEBA_WET, &level.amoeba_speed, TEXT_SPEED },
{ EL_AMOEBA_DRY, &level.amoeba_speed, TEXT_SPEED },
{ EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_SPEED },
UnmapLevelEditorWindowGadgets();
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
- "Element Settings", FONT_DEFAULT_BIG);
+ "Element Settings", FONT_TITLE_1);
DrawElementBorder(SX + xstart * MINI_TILEX,
SY + ystart * MINI_TILEY + MINI_TILEY / 2,
FrameCounter = 0; /* restart animation frame counter */
DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
- font_color, getElementInfoText(properties_element));
+ FONT_TEXT_1, getElementInfoText(properties_element));
num_elements_in_level = 0;
for (y=0; y<lev_fieldy; y++)
num_elements_in_level++;
percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
- DrawTextF(ED_SETTINGS_XPOS, 5 * TILEY, font_color, "In this level:");
- DrawTextF(ED_SETTINGS_XPOS + 15 * getFontWidth(font_color), 5 * TILEY,
- FONT(FS_SMALL, FC_YELLOW), "%d (%.2f%%)", num_elements_in_level,
+ DrawTextF(ED_SETTINGS_XPOS, 5 * TILEY, FONT_TEXT_1, "In this level:");
+ DrawTextF(ED_SETTINGS_XPOS + 15 * getFontWidth(FONT_TEXT_1), 5 * TILEY,
+ FONT_TEXT_2, "%d (%.2f%%)", num_elements_in_level,
percentage);
/* check if there are elements where a score can be chosen for */
int y = counterbutton_info[counter_id].y + yoffset_right;
counterbutton_info[counter_id].value = elements_with_counter[i].value;
- DrawTextF(x, y, font_color, elements_with_counter[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, elements_with_counter[i].text);
ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
MapCounterButtons(counter_id);
x = checkbutton_info[i].x + xoffset_right2;
y = checkbutton_info[i].y + yoffset_right2;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
x = checkbutton_info[i].x + xoffset_right2;
y = checkbutton_info[i].y + yoffset_right2;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
checkbutton_info[i].value = &custom_element_properties[nr].can_smash;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
checkbutton_info[i].value = &custom_element_properties[nr].pushable;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
checkbutton_info[i].value = &custom_element_properties[nr].slippery;
- DrawTextF(x, y, font_color, checkbutton_info[i].text);
+ DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
+
+ /* draw selectbox gadget */
+ i = ED_SELECTBOX_ID_TEST;
+ x = selectbox_info[i].x + xoffset_right2;
+ y = selectbox_info[i].y + yoffset_right2;
+
+ selectbox_info[i].index = &test_index;
+
+ DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
+ ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
+ GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
+ MapSelectboxGadget(i);
}
}
}
}
-static void DrawRectangle(int from_x, int from_y, int to_x, int to_y,
- int element, boolean change_level)
+static void DrawBox(int from_x, int from_y, int to_x, int to_y,
+ int element, boolean change_level)
{
DrawLine(from_x, from_y, from_x, to_y, element, change_level);
DrawLine(from_x, to_y, to_x, to_y, element, change_level);
int element, boolean change_level)
{
if (element == -1 || change_level)
- DrawRectangle(from_x, from_y, to_x, to_y, -1, FALSE);
+ DrawBox(from_x, from_y, to_x, to_y, -1, FALSE);
else
DrawAreaBorder(from_x, from_y, to_x, to_y);
}
}
else if (new_element != Feld[lx][ly])
{
- if (new_element == EL_PLAYER1)
+ if (new_element == EL_PLAYER_1)
{
/* remove player at old position */
for(y=0; y<lev_fieldy; y++)
{
for(x=0; x<lev_fieldx; x++)
{
- if (Feld[x][y] == EL_PLAYER1)
+ if (Feld[x][y] == EL_PLAYER_1)
{
Feld[x][y] = EL_EMPTY;
if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
else if (drawing_function == GADGET_ID_ARC)
draw_func = DrawArc;
else if (drawing_function == GADGET_ID_RECTANGLE)
- draw_func = DrawRectangle;
+ draw_func = DrawBox;
else if (drawing_function == GADGET_ID_FILLED_BOX)
draw_func = DrawFilledBox;
else if (drawing_function == GADGET_ID_GRAB_BRUSH)
strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
}
+static void HandleSelectboxGadgets(struct GadgetInfo *gi)
+{
+ *selectbox_info[gi->custom_type_id].index = gi->selectbox.index;
+
+#if 1
+ printf("Selected text value: '%s'\n",
+ selectbox_info[gi->custom_type_id].values[gi->selectbox.index]);
+#endif
+}
+
static void HandleRadiobuttons(struct GadgetInfo *gi)
{
*radiobutton_info[gi->custom_type_id].value =
}
}
- DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_DEFAULT_SMALL);
+ DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_TEXT_2);
}
static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
}
if (drawing_function == GADGET_ID_PICK_ELEMENT)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"%s: %d, %d", infotext, lx, ly);
else
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"%s: %d, %d", infotext,
ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1);
}
else if (drawing_function == GADGET_ID_PICK_ELEMENT)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"%s", getElementInfoText(Feld[lx][ly]));
else
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"Level position: %d, %d", lx, ly);
}
}
}
else if (id == GADGET_ID_AMOEBA_CONTENT)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"Amoeba content");
else if (id == GADGET_ID_RANDOM_BACKGROUND)
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"Random placement background");
else
- DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_DEFAULT_SMALL,
+ DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
"Content area %d position: %d, %d",
id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
}
projects / rocksndiamonds.git / blobdiff