X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=96adfcfebc88f2a50b5dd10670c805136593e617;hb=10b9382e55f3a8cd0a15644cf1ed6e1451654a76;hp=04d06e69e6979255cbe12e37936971b5db213167;hpb=4bd981e9a75290ad6178c167ce8e02635ca7fa53;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 04d06e69..96adfcfe 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -821,7 +821,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) src_height = src_bitmap->height; tmp_width = src_width; - tmp_height = src_height + src_height / 2; + tmp_height = src_height + (src_height + 1) / 2; /* prevent odd height */ tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); @@ -838,9 +838,11 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) FreeBitmap(tmp_bitmap_8); #if defined(TARGET_SDL) + /* !!! what about the old src_bitmap->surface ??? FIX ME !!! */ src_bitmap->surface = tmp_bitmap->surface; tmp_bitmap->surface = NULL; #else + /* !!! see above !!! */ src_bitmap->drawable = tmp_bitmap->drawable; tmp_bitmap->drawable = None; #endif @@ -855,6 +857,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) /* mouse pointer functions */ /* ------------------------------------------------------------------------- */ +#if !defined(PLATFORM_MSDOS) /* XPM */ static const char *cursor_image_playfield[] = { @@ -940,9 +943,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 +958,7 @@ void SetMouseCursor(int mode) #elif defined(TARGET_X11_NATIVE) X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); #endif +#endif }