EL_CHAR('R'),
*/
- EL_EMPTY,
- EL_EMPTY,
- EL_EMPTY,
- EL_EMPTY,
+ EL_CHAR('C'),
+ EL_CHAR('U'),
+ EL_CHAR('S'),
+ EL_CHAR('-'),
+
+ EL_CHAR('T'),
+ EL_CHAR('O'),
+ EL_CHAR('M'),
+ EL_CHAR(' '),
+
+ EL_CHAR('E'),
+ EL_CHAR('L'),
+ EL_CHAR('E'),
+ EL_CHAR('M'),
+
+ EL_CHAR('E'),
+ EL_CHAR('N'),
+ EL_CHAR('T'),
+ EL_CHAR('S'),
+
+ EL_GENERIC_START + 0,
+ EL_GENERIC_START + 1,
+ EL_GENERIC_START + 2,
+ EL_GENERIC_START + 3,
+
+ EL_GENERIC_START + 4,
+ EL_GENERIC_START + 5,
+ EL_GENERIC_START + 6,
+ EL_GENERIC_START + 7,
+
+ EL_GENERIC_START + 8,
+ EL_GENERIC_START + 9,
+ EL_GENERIC_START + 10,
+ EL_GENERIC_START + 11,
+
+ EL_GENERIC_START + 12,
+ EL_GENERIC_START + 13,
+ EL_GENERIC_START + 14,
+ EL_GENERIC_START + 15,
+
+ EL_GENERIC_START + 16,
+ EL_GENERIC_START + 17,
+ EL_GENERIC_START + 18,
+ EL_GENERIC_START + 19,
+
+ EL_GENERIC_START + 20,
+ EL_GENERIC_START + 21,
+ EL_GENERIC_START + 22,
+ EL_GENERIC_START + 23,
+
+ EL_GENERIC_START + 24,
+ EL_GENERIC_START + 25,
+ EL_GENERIC_START + 26,
+ EL_GENERIC_START + 27,
+
+ EL_GENERIC_START + 28,
+ EL_GENERIC_START + 29,
+ EL_GENERIC_START + 30,
+ EL_GENERIC_START + 31,
+
+ EL_CHAR('T'),
+ EL_CHAR('E'),
+ EL_CHAR('X'),
+ EL_CHAR('T'),
EL_CHAR(' '),
EL_CHAR('!'),
EL_CHAR('Ö'),
EL_CHAR('Ü'),
EL_CHAR('^'),
- EL_CHAR(' ')
+ EL_CHAR('_'),
+
+ EL_CHAR(' '),
+ EL_CHAR('°'),
+ EL_CHAR('´'),
+ EL_CHAR('|')
};
int elements_in_list = sizeof(editor_element)/sizeof(int);
{
char *info_text = "unknown";
- if (element < NUM_FILE_ELEMENTS)
+ if (element < NUM_FILE_ELEMENTS &&
+ element_info[element].editor_description != NULL)
info_text = element_info[element].editor_description;
else
Error(ERR_WARN, "no element description for element %d", element);
static void CreateControlButtons()
{
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
struct GadgetInfo *gi;
unsigned long event_mask;
int i;
gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
gd_y = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
- getMiniGraphicSource(el2gfx(editor_element[i]),
+ getMiniGraphicSource(el2img(editor_element[i]),
&deco_bitmap, &deco_x, &deco_y);
deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
for (j=0; j<2; j++)
{
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
struct GadgetInfo *gi;
int id = (j == 0 ?
counterbutton_info[i].gadget_id_down :
for (i=0; i<ED_NUM_TEXTINPUT; i++)
{
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
unsigned long event_mask;
for (i=0; i<ED_NUM_SCROLLBARS; i++)
{
int id = scrollbar_info[i].gadget_id;
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
static void CreateCheckbuttonGadgets()
{
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
struct GadgetInfo *gi;
unsigned long event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
}
/* copy default editor door content to main double buffer */
- BlitBitmap(pix[PIX_DOOR], drawto,
+ BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
/* draw mouse button brush elements */
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
- el2gfx(new_element1));
+ el2img(new_element1));
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
- el2gfx(new_element2));
+ el2img(new_element2));
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
- el2gfx(new_element3));
+ el2img(new_element3));
/* draw bigger door */
DrawSpecialEditorDoor();
/* draw new control window */
- BlitBitmap(pix[PIX_DOOR], drawto,
+ BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
redraw_mask |= REDRAW_ALL;
MapControlButtons();
/* copy actual editor door content to door double buffer for OpenDoor() */
- BlitBitmap(drawto, pix[PIX_DB_DOOR],
+ BlitBitmap(drawto, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
DrawEditModeWindow();
new_element1 = element;
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
- el2gfx(new_element1));
+ el2img(new_element1));
}
else if (button == 2)
{
new_element2 = element;
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
- el2gfx(new_element2));
+ el2img(new_element2));
}
else
{
new_element3 = element;
DrawMiniGraphicExt(drawto,
DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
- el2gfx(new_element3));
+ el2img(new_element3));
}
redraw_mask |= REDRAW_DOOR_1;
SX + xstart * MINI_TILEX - MINI_TILEX/2,
SY + ystart * MINI_TILEY - MINI_TILEY/2);
- DrawGraphic(xstart/2, ystart/2, el2gfx(properties_element));
+ DrawGraphic(xstart / 2, ystart / 2, el2img(properties_element), 0);
/* copy the whole stuff to the definitive location */
BlitBitmap(drawto, drawto,
DrawMiniGraphicExt(drawto,
gi->x + sx * MINI_TILEX,
gi->y + sy * MINI_TILEY,
- el2gfx(new_element));
+ el2img(new_element));
DrawMiniGraphicExt(window,
gi->x + sx * MINI_TILEX,
gi->y + sy * MINI_TILEY,
- el2gfx(new_element));
+ el2img(new_element));
if (id == GADGET_ID_AMOEBA_CONTENT)
level.amoeba_content = new_element;
int element = editor_element[element_shift + i];
UnmapGadget(gi);
- getMiniGraphicSource(el2gfx(element), &gd->bitmap, &gd->x, &gd->y);
+ getMiniGraphicSource(el2img(element), &gd->bitmap, &gd->x, &gd->y);
ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
MapGadget(gi);
}
else
{
CloseDoor(DOOR_CLOSE_1);
- BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+ BlitBitmap(bitmap_db_door, bitmap_db_door,
DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
OpenDoor(DOOR_OPEN_1);