InitGraphicInfo(); /* initialize graphic info from config file */
InitFontInfo(bitmap_font_initial,
- new_graphic_info[IMG_MENU_FONT_BIG].bitmap,
- new_graphic_info[IMG_MENU_FONT_MEDIUM].bitmap,
- new_graphic_info[IMG_MENU_FONT_SMALL].bitmap,
- new_graphic_info[IMG_MENU_FONT_EM].bitmap);
+ new_graphic_info[IMG_FONT_BIG].bitmap,
+ new_graphic_info[IMG_FONT_MEDIUM].bitmap,
+ new_graphic_info[IMG_FONT_SMALL].bitmap,
+ new_graphic_info[IMG_FONT_EM].bitmap);
+
+ SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
+ SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
InitGadgets();
InitToons();
fieldbuffer = bitmap_db_field;
SetDrawtoField(DRAW_BACKBUFFER);
- BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer,
+ BlitBitmap(new_graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
element_info[i].graphic[GFX_ACTION_DEFAULT] =
IMG_CHAR_START + (i - EL_CHAR_START);
- for (i=EL_GENERIC_START; i<=EL_GENERIC_END; i++)
+ for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
element_info[i].graphic[GFX_ACTION_DEFAULT] =
- IMG_GENERIC_START + (i - EL_GENERIC_START);
+ IMG_CUSTOM_START + (i - EL_CUSTOM_START);
i = 0;
while (element_to_graphic[i].element > -1)
static void InitGraphicInfo()
{
+ static boolean clipmasks_initialized = FALSE;
static int gfx_action[NUM_IMAGE_FILES];
- Bitmap *src_bitmap;
int src_x, src_y;
int first_frame, last_frame;
int i;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ Pixmap src_pixmap;
+ XGCValues clip_gc_values;
+ unsigned long clip_gc_valuemask;
+ GC copy_clipmask_gc = None;
+#endif
image_files = getCurrentImageList();
i++;
}
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ if (clipmasks_initialized)
+ {
+ for (i=0; i<NUM_IMAGE_FILES; i++)
+ {
+ if (new_graphic_info[i].clip_mask)
+ XFreePixmap(display, new_graphic_info[i].clip_mask);
+ if (new_graphic_info[i].clip_gc)
+ XFreeGC(display, new_graphic_info[i].clip_gc);
+
+ new_graphic_info[i].clip_mask = None;
+ new_graphic_info[i].clip_gc = None;
+ }
+ }
+#endif
+
for (i=0; i<NUM_IMAGE_FILES; i++)
{
+ Bitmap *src_bitmap = getBitmapFromImageID(i);
+ int num_xtiles = (src_bitmap ? src_bitmap->width : TILEX) / TILEX;
+ int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
int *parameter = image_files[i].parameter;
- new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+ new_graphic_info[i].bitmap = src_bitmap;
new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE)
new_graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET];
- new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+ /* automatically determine correct number of frames, if not defined */
+ if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE)
+ new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+ else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+ new_graphic_info[i].anim_frames = num_xtiles;
+ else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+ new_graphic_info[i].anim_frames = num_ytiles;
+ else
+ new_graphic_info[i].anim_frames = 1;
new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
if (new_graphic_info[i].anim_delay == 0) /* delay must be at least 1 */
new_graphic_info[i].anim_mode = ANIM_PINGPONG;
else if (parameter[GFX_ARG_MODE_PINGPONG2])
new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
- else if (parameter[GFX_ARG_FRAMES] > 1)
+ else if (new_graphic_info[i].anim_frames > 1)
new_graphic_info[i].anim_mode = ANIM_LOOP;
else
new_graphic_info[i].anim_mode = ANIM_NONE;
/* now check if no animation frames are outside of the loaded image */
+ if (new_graphic_info[i].bitmap == NULL)
+ continue; /* skip check for optional images that are undefined */
+
first_frame = 0;
getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
if (src_x < 0 || src_y < 0 ||
getTokenFromImageID(i));
Error(ERR_RETURN, "- image file: '%s'",
src_bitmap->source_filename);
- Error(ERR_EXIT, "error: last animation frame out of bounds (%d,%d)",
- src_x, src_y);
+ Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)",
+ last_frame, src_x, src_y);
}
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ /* currently we need only a tile clip mask from the first frame */
+ getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+
+ if (copy_clipmask_gc == None)
+ {
+ clip_gc_values.graphics_exposures = False;
+ clip_gc_valuemask = GCGraphicsExposures;
+ copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+ clip_gc_valuemask, &clip_gc_values);
+ }
+
+ new_graphic_info[i].clip_mask =
+ XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
+
+ src_pixmap = src_bitmap->clip_mask;
+ XCopyArea(display, src_pixmap, new_graphic_info[i].clip_mask,
+ copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0);
+
+ clip_gc_values.graphics_exposures = False;
+ clip_gc_values.clip_mask = new_graphic_info[i].clip_mask;
+ clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+ new_graphic_info[i].clip_gc =
+ XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+#endif
}
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ if (copy_clipmask_gc)
+ XFreeGC(display, copy_clipmask_gc);
+#endif
+
+ clipmasks_initialized = TRUE;
}
static void InitSoundInfo()