X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=20ea20bed03553ee0e76107830f8dc3031045e41;hb=95e671b15104bb05c8302000facc906cbf0b133e;hp=c99010bc9bde7fde6a77e2f7f8451fc8790f8ade;hpb=0838017832a108ba365ea0efb851fc8c4d5f3aa5;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index c99010bc..20ea20be 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -196,6 +196,20 @@ void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) gfx.scrollbuffer_height = scrollbuffer_height; } +void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)) +{ + gfx.draw_busy_anim_function = draw_busy_anim_function; +} + +void InitGfxCustomArtworkInfo() +{ + gfx.override_level_graphics = FALSE; + gfx.override_level_sounds = FALSE; + gfx.override_level_music = FALSE; + + gfx.draw_init_text = TRUE; +} + void SetDrawDeactivationMask(int draw_deactivation_mask) { gfx.draw_deactivation_mask = draw_deactivation_mask; @@ -262,17 +276,24 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile) { + /* remove every mask before setting mask for window */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ + SetBackgroundBitmap(NULL, 0xffff); /* !!! FIX THIS !!! */ SetBackgroundBitmap(background_bitmap_tile, REDRAW_ALL); } void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) { + /* remove window area mask before setting mask for main area */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD); } void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile) { + /* remove window area mask before setting mask for door area */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1); } @@ -363,16 +384,18 @@ Bitmap *CreateBitmapStruct(void) Bitmap *CreateBitmap(int width, int height, int depth) { Bitmap *new_bitmap = CreateBitmapStruct(); - int real_depth = GetRealDepth(depth); + int real_width = MAX(1, width); /* prevent zero bitmap width */ + int real_height = MAX(1, height); /* prevent zero bitmap height */ + int real_depth = GetRealDepth(depth); #if defined(TARGET_SDL) - SDLCreateBitmapContent(new_bitmap, width, height, real_depth); + SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth); #else - X11CreateBitmapContent(new_bitmap, width, height, real_depth); + X11CreateBitmapContent(new_bitmap, real_width, real_height, real_depth); #endif - new_bitmap->width = width; - new_bitmap->height = height; + new_bitmap->width = real_width; + new_bitmap->height = real_height; return new_bitmap; } @@ -468,8 +491,34 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, if (DrawingDeactivated(dst_x, dst_y, width, height)) return; - sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, - dst_x, dst_y, BLIT_OPAQUE); +#if 0 + /* !!! APPARENTLY THIS HAS BEEN FIXED IN SDL 1.2.12 !!! */ +#if defined(TARGET_SDL) && defined(PLATFORM_WIN32) + if (src_bitmap == dst_bitmap) + { + /* !!! THIS IS A BUG (IN THE SDL LIBRARY?) AND SHOULD BE FIXED !!! */ + + /* needed when blitting directly to same bitmap -- should not be needed with + recent SDL libraries, but apparently does not work in 1.2.11 directly */ + + static Bitmap *tmp_bitmap = NULL; + + if (tmp_bitmap == NULL) + tmp_bitmap = CreateBitmap(MAX(FXSIZE, WIN_XSIZE), + MAX(FYSIZE, WIN_YSIZE), DEFAULT_DEPTH); + + sysCopyArea(src_bitmap, tmp_bitmap, + src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); + sysCopyArea(tmp_bitmap, dst_bitmap, + src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); + + return; + } +#endif +#endif + + sysCopyArea(src_bitmap, dst_bitmap, + src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); } void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, @@ -839,13 +888,10 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) return dst_bitmap; } -#define MORE_ZOOM 1 - static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, boolean create_small_bitmaps) { Bitmap swap_bitmap; -#if MORE_ZOOM Bitmap *new_bitmap; Bitmap *tmp_bitmap_1; Bitmap *tmp_bitmap_2; @@ -859,10 +905,6 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, int width_8, height_8; int width_16, height_16; int width_32, height_32; -#else - Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_4,*tmp_bitmap_8; - int width_1, height_1, width_2, height_2, width_4, height_4, width_8,height_8; -#endif int new_width, new_height; /* calculate new image dimensions for normal sized image */ @@ -876,12 +918,11 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, tmp_bitmap_1 = old_bitmap; /* this is only needed to make compilers happy */ -#if MORE_ZOOM - tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = tmp_bitmap_16 = NULL; + tmp_bitmap_2 = NULL; + tmp_bitmap_4 = NULL; + tmp_bitmap_8 = NULL; + tmp_bitmap_16 = NULL; tmp_bitmap_32 = NULL; -#else - tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL; -#endif if (create_small_bitmaps) { @@ -892,12 +933,12 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, height_4 = height_1 / 4; width_8 = width_1 / 8; height_8 = height_1 / 8; -#if MORE_ZOOM width_16 = width_1 / 16; height_16 = height_1 / 16; width_32 = width_1 / 32; height_32 = height_1 / 32; -#endif + + UPDATE_BUSY_STATE(); /* get image with 1/2 of normal size (for use in the level editor) */ if (zoom_factor != 2) @@ -905,33 +946,42 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, else tmp_bitmap_2 = old_bitmap; + UPDATE_BUSY_STATE(); + /* get image with 1/4 of normal size (for use in the level editor) */ if (zoom_factor != 4) tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_2 / 2, height_2 / 2); else tmp_bitmap_4 = old_bitmap; + UPDATE_BUSY_STATE(); + /* get image with 1/8 of normal size (for use on the preview screen) */ if (zoom_factor != 8) tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2); else tmp_bitmap_8 = old_bitmap; -#if MORE_ZOOM + UPDATE_BUSY_STATE(); + /* get image with 1/16 of normal size (for use on the preview screen) */ if (zoom_factor != 16) tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_8 / 2, height_8 / 2); else tmp_bitmap_16 = old_bitmap; + UPDATE_BUSY_STATE(); + /* get image with 1/32 of normal size (for use on the preview screen) */ if (zoom_factor != 32) tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_16 / 2, height_16 / 2); else tmp_bitmap_32 = old_bitmap; -#endif + + UPDATE_BUSY_STATE(); } +#if 0 /* if image was scaled up, create new clipmask for normal size image */ if (zoom_factor != 1) { @@ -956,6 +1006,7 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, SDL_SetColorKey(tmp_surface_1, 0, 0); /* reset transparent pixel */ #endif } +#endif if (create_small_bitmaps) { @@ -971,12 +1022,12 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, width_1 / 2, height_1); BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8, 3 * width_1 / 4, height_1); -#if MORE_ZOOM BlitBitmap(tmp_bitmap_16, new_bitmap, 0, 0, width_1 / 16, height_1 / 16, 7 * width_1 / 8, height_1); BlitBitmap(tmp_bitmap_32, new_bitmap, 0, 0, width_1 / 32, height_1 / 32, 15 * width_1 / 16, height_1); -#endif + + UPDATE_BUSY_STATE(); } else { @@ -1001,12 +1052,11 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, if (zoom_factor != 8) FreeBitmap(tmp_bitmap_8); -#if MORE_ZOOM if (zoom_factor != 16) FreeBitmap(tmp_bitmap_16); + if (zoom_factor != 32) FreeBitmap(tmp_bitmap_32); -#endif } /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */ @@ -1023,6 +1073,34 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, old_bitmap->width = new_bitmap->width; old_bitmap->height = new_bitmap->height; +#if 1 + /* this replaces all blit masks created when loading -- maybe optimize this */ + { +#if defined(TARGET_X11) + if (old_bitmap->clip_mask) + XFreePixmap(display, old_bitmap->clip_mask); + + old_bitmap->clip_mask = + Pixmap_to_Mask(old_bitmap->drawable, new_width, new_height); + + XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask); +#else + SDL_Surface *old_surface = old_bitmap->surface; + + if (old_bitmap->surface_masked) + SDL_FreeSurface(old_bitmap->surface_masked); + + SDL_SetColorKey(old_surface, SDL_SRCCOLORKEY, + SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00)); + if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) ==NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed"); + SDL_SetColorKey(old_surface, 0, 0); /* reset transparent pixel */ +#endif + } +#endif + + UPDATE_BUSY_STATE(); + FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */ }