X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=78fd020039b03ff13ba6895e349387b51c2b8133;hb=6890bb7cb72e140f4b82f35217655ae6c5213fec;hp=04d06e69e6979255cbe12e37936971b5db213167;hpb=4bd981e9a75290ad6178c167ce8e02635ca7fa53;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 04d06e69..78fd0200 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 } @@ -194,9 +197,9 @@ static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize; int x, y; - for (y=0; y < tile_ysteps; y++) + for (y = 0; y < tile_ysteps; y++) { - for (x=0; x < tile_xsteps; x++) + for (x = 0; x < tile_xsteps; x++) { int draw_x = dest_x + x * tile_xsize; int draw_y = dest_y + y * tile_ysize; @@ -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; } @@ -559,9 +561,9 @@ inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, { int x, y; - for (x=0; xwidth * 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; + + /* 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; - src_width = src_bitmap->width; - src_height = src_bitmap->height; + /* 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_width = src_width; - tmp_height = src_height + src_height / 2; + /* 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; - tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + /* 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); + + 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 + } - tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); - tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + new_width = width_1; + new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */ - 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); + new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH); - FreeBitmap(tmp_bitmap_2); - FreeBitmap(tmp_bitmap_8); + 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 old_bitmap->surface ??? FIX ME !!! */ + old_bitmap->surface = new_bitmap->surface; + new_bitmap->surface = NULL; +#else + /* !!! see above !!! */ + 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) - src_bitmap->surface = tmp_bitmap->surface; - tmp_bitmap->surface = NULL; + swap_bitmap.surface = old_bitmap->surface; + old_bitmap->surface = new_bitmap->surface; + new_bitmap->surface = swap_bitmap.surface; #else - src_bitmap->drawable = tmp_bitmap->drawable; - tmp_bitmap->drawable = None; + swap_bitmap.drawable = old_bitmap->drawable; + old_bitmap->drawable = new_bitmap->drawable; + new_bitmap->drawable = swap_bitmap.drawable; #endif - src_bitmap->height = tmp_bitmap->height; +#endif + + old_bitmap->width = new_bitmap->width; + old_bitmap->height = new_bitmap->height; - FreeBitmap(tmp_bitmap); + FreeBitmap(new_bitmap); } @@ -855,6 +928,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) /* mouse pointer functions */ /* ------------------------------------------------------------------------- */ +#if !defined(PLATFORM_MSDOS) /* XPM */ static const char *cursor_image_playfield[] = { @@ -866,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 ", @@ -886,6 +985,7 @@ static const char *cursor_image_playfield[] = /* hot spot */ "1,1" +#endif }; #if defined(TARGET_SDL) @@ -906,9 +1006,9 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) sscanf(image[0], " %d %d ", &cursor->width, &cursor->height); i = -1; - for (y=0; y < cursor->width; y++) + for (y = 0; y < cursor->width; y++) { - for (x=0; x < cursor->height; x++) + for (x = 0; x < cursor->height; x++) { int bit_nr = x % 8; int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr ); @@ -940,9 +1040,11 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) return cursor; } +#endif /* !PLATFORM_MSDOS */ void SetMouseCursor(int mode) { +#if !defined(PLATFORM_MSDOS) static struct MouseCursorInfo *cursor_playfield = NULL; if (cursor_playfield == NULL) @@ -953,6 +1055,7 @@ void SetMouseCursor(int mode) #elif defined(TARGET_X11_NATIVE) X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); #endif +#endif } @@ -1040,6 +1143,15 @@ inline void NextEvent(Event *event) #endif } +inline void PeekEvent(Event *event) +{ +#if defined(TARGET_SDL) + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); +#else + XPeekEvent(display, event); +#endif +} + inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) { #if defined(TARGET_SDL) @@ -1159,7 +1271,7 @@ inline void InitJoysticks() /* always start with reliable default values */ joystick.status = JOYSTICK_NOT_AVAILABLE; - for (i=0; i