X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=ed73cb5bf3c5129092af6f764c38cd8f725ddd23;hb=9583e9c55b889974e0df9a8ca1930efdf29bda29;hp=1c33deb66375d930e42c891f98017114e73cffcc;hpb=74c0f7de91268e40d15948f473eac51a9760b9c0;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 1c33deb6..ed73cb5b 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -21,6 +21,7 @@ #endif #include "system.h" +#include "image.h" #include "sound.h" #include "setup.h" #include "joystick.h" @@ -117,6 +118,8 @@ void InitPlatformDependentStuff(void) #if defined(TARGET_SDL) if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); + + SDLNet_Init(); #endif } @@ -370,8 +373,7 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) X11FreeBitmapPointers(bitmap); #endif - if (bitmap->source_filename) - free(bitmap->source_filename); + checked_free(bitmap->source_filename); bitmap->source_filename = NULL; } @@ -811,45 +813,114 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) return dst_bitmap; } -void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) +void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor) { - Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8; - int src_width, src_height; - int tmp_width, tmp_height; + Bitmap swap_bitmap; + Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_8; + int width_1, height_1, width_2, height_2, width_8, height_8; + int new_width, new_height; - src_width = src_bitmap->width; - src_height = src_bitmap->height; + width_1 = old_bitmap->width * zoom_factor; + height_1 = old_bitmap->height * zoom_factor; + width_2 = width_1 / 2; + height_2 = height_1 / 2; + width_8 = width_1 / 8; + height_8 = height_1 / 8; - tmp_width = src_width; - tmp_height = src_height + (src_height + 1) / 2; /* prevent odd height */ + /* get image with normal size (this might require scaling up) */ + if (zoom_factor != 1) + tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1); + else + tmp_bitmap_1 = old_bitmap; - tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + /* get image with 1/2 of normal size (for use in the level editor) */ + if (zoom_factor != 2) + tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_1 / 2, height_1 / 2); + else + tmp_bitmap_2 = old_bitmap; - tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); - tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + /* get image with 1/8 of normal size (for use on the preview screen) */ + if (zoom_factor != 8) + tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_1, width_1 / 8, height_1 / 8); + else + tmp_bitmap_8 = old_bitmap; + + /* if image was scaled up, create new clipmask for normal size image */ + if (zoom_factor != 1) + { +#if defined(TARGET_X11) + if (old_bitmap->clip_mask) + XFreePixmap(display, old_bitmap->clip_mask); - BlitBitmap(src_bitmap, tmp_bitmap, 0, 0, src_width, src_height, 0, 0); - BlitBitmap(tmp_bitmap_2, tmp_bitmap, 0, 0, src_width / 2, src_height / 2, - 0, src_height); - BlitBitmap(tmp_bitmap_8, tmp_bitmap, 0, 0, src_width / 8, src_height / 8, - 3 * src_width / 4, src_height); + old_bitmap->clip_mask = + Pixmap_to_Mask(tmp_bitmap_1->drawable, width_1, height_1); + + XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask); +#else + SDL_Surface *tmp_surface_1 = tmp_bitmap_1->surface; + + if (old_bitmap->surface_masked) + SDL_FreeSurface(old_bitmap->surface_masked); + + SDL_SetColorKey(tmp_surface_1, SDL_SRCCOLORKEY, + SDL_MapRGB(tmp_surface_1->format, 0x00, 0x00, 0x00)); + if ((old_bitmap->surface_masked = SDL_DisplayFormat(tmp_surface_1)) ==NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed"); + SDL_SetColorKey(tmp_surface_1, 0, 0); /* reset transparent pixel */ +#endif + } - FreeBitmap(tmp_bitmap_2); - FreeBitmap(tmp_bitmap_8); + new_width = width_1; + new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */ + + new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH); + + BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0); + BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2, + 0, height_1); + BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8, + 3 * width_1 / 4, height_1); + + if (zoom_factor != 1) + FreeBitmap(tmp_bitmap_1); + + if (zoom_factor != 2) + FreeBitmap(tmp_bitmap_2); + + if (zoom_factor != 8) + FreeBitmap(tmp_bitmap_8); + +#if 0 #if defined(TARGET_SDL) - /* !!! what about the old src_bitmap->surface ??? FIX ME !!! */ - src_bitmap->surface = tmp_bitmap->surface; - tmp_bitmap->surface = NULL; + /* !!! what about the old old_bitmap->surface ??? FIX ME !!! */ + old_bitmap->surface = new_bitmap->surface; + new_bitmap->surface = NULL; #else /* !!! see above !!! */ - src_bitmap->drawable = tmp_bitmap->drawable; - tmp_bitmap->drawable = None; + old_bitmap->drawable = new_bitmap->drawable; + new_bitmap->drawable = None; +#endif + +#else + + /* replace image with extended image (containing normal, 1/2 and 1/8 size) */ +#if defined(TARGET_SDL) + swap_bitmap.surface = old_bitmap->surface; + old_bitmap->surface = new_bitmap->surface; + new_bitmap->surface = swap_bitmap.surface; +#else + swap_bitmap.drawable = old_bitmap->drawable; + old_bitmap->drawable = new_bitmap->drawable; + new_bitmap->drawable = swap_bitmap.drawable; +#endif + #endif - src_bitmap->height = tmp_bitmap->height; + old_bitmap->width = new_bitmap->width; + old_bitmap->height = new_bitmap->height; - FreeBitmap(tmp_bitmap); + FreeBitmap(new_bitmap); } @@ -869,6 +940,31 @@ static const char *cursor_image_playfield[] = ". c #ffffff", " c None", +#if 1 + /* some people complained about a "white dot" on the screen and thought it + was a graphical error... OK, let's just remove the whole pointer :-) */ + + /* pixels */ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + + /* hot spot */ + "0,0" +#else /* pixels */ " X ", "X.X ", @@ -889,6 +985,7 @@ static const char *cursor_image_playfield[] = /* hot spot */ "1,1" +#endif }; #if defined(TARGET_SDL)