projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070327-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 7d0099f4af002628d2024ffcee250b18f2942240..c99010bc9bde7fde6a77e2f7f8451fc8790f8ade 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-839,12
+839,30
@@
Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
return dst_bitmap;
}
return dst_bitmap;
}
+#define MORE_ZOOM 1
+
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
boolean create_small_bitmaps)
{
Bitmap swap_bitmap;
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;
+ Bitmap *tmp_bitmap_4;
+ Bitmap *tmp_bitmap_8;
+ Bitmap *tmp_bitmap_16;
+ Bitmap *tmp_bitmap_32;
+ int width_1, height_1;
+ int width_2, height_2;
+ int width_4, height_4;
+ 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;
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 */
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
@@
-858,7
+876,12
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
tmp_bitmap_1 = old_bitmap;
/* this is only needed to make compilers happy */
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_32 = NULL;
+#else
tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL;
tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL;
+#endif
if (create_small_bitmaps)
{
if (create_small_bitmaps)
{
@@
-869,6
+892,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;
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
/* get image with 1/2 of normal size (for use in the level editor) */
if (zoom_factor != 2)
/* get image with 1/2 of normal size (for use in the level editor) */
if (zoom_factor != 2)
@@
-887,6
+916,20
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2);
else
tmp_bitmap_8 = old_bitmap;
tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2);
else
tmp_bitmap_8 = old_bitmap;
+
+#if MORE_ZOOM
+ /* 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;
+
+ /* 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
}
/* if image was scaled up, create new clipmask for normal size image */
}
/* if image was scaled up, create new clipmask for normal size image */
@@
-928,6
+971,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);
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
}
else
{
}
else
{
@@
-951,6
+1000,13
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
if (zoom_factor != 8)
FreeBitmap(tmp_bitmap_8);
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) */
}
/* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */
@@
-986,8
+1042,9
@@
void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
/* ------------------------------------------------------------------------- */
#if !defined(PLATFORM_MSDOS)
/* ------------------------------------------------------------------------- */
#if !defined(PLATFORM_MSDOS)
-/* XPM */
-static const char *cursor_image_playfield[] =
+#define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER 0
+/* XPM image definitions */
+static const char *cursor_image_none[] =
{
/* width height num_colors chars_per_pixel */
" 16 16 3 1",
{
/* width height num_colors chars_per_pixel */
" 16 16 3 1",
@@
-997,10
+1054,6
@@
static const char *cursor_image_playfield[] =
". c #ffffff",
" c None",
". 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 */
" ",
" ",
/* pixels */
" ",
" ",
@@
-1021,8
+1074,17
@@
static const char *cursor_image_playfield[] =
/* hot spot */
"0,0"
/* hot spot */
"0,0"
+};
+#if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER
+static const char *cursor_image_dot[] =
+{
+ /* width height num_colors chars_per_pixel */
+ " 16 16 3 1",
-#else
+ /* colors */
+ "X c #000000",
+ ". c #ffffff",
+ " c None",
/* pixels */
" X ",
/* pixels */
" X ",
@@
-1044,8
+1106,13
@@
static const char *cursor_image_playfield[] =
/* hot spot */
"1,1"
/* hot spot */
"1,1"
-#endif
};
};
+static const char **cursor_image_playfield = cursor_image_dot;
+#else
+/* 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 :-) */
+static const char **cursor_image_playfield = cursor_image_none;
+#endif
#if defined(TARGET_SDL)
static const int cursor_bit_order = BIT_ORDER_MSB;
#if defined(TARGET_SDL)
static const int cursor_bit_order = BIT_ORDER_MSB;
@@
-1104,15
+1171,24
@@
static struct MouseCursorInfo *get_cursor_from_image(const char **image)
void SetMouseCursor(int mode)
{
#if !defined(PLATFORM_MSDOS)
void SetMouseCursor(int mode)
{
#if !defined(PLATFORM_MSDOS)
+ static struct MouseCursorInfo *cursor_none = NULL;
static struct MouseCursorInfo *cursor_playfield = NULL;
static struct MouseCursorInfo *cursor_playfield = NULL;
+ struct MouseCursorInfo *cursor_new;
+
+ if (cursor_none == NULL)
+ cursor_none = get_cursor_from_image(cursor_image_none);
if (cursor_playfield == NULL)
cursor_playfield = get_cursor_from_image(cursor_image_playfield);
if (cursor_playfield == NULL)
cursor_playfield = get_cursor_from_image(cursor_image_playfield);
+ cursor_new = (mode == CURSOR_DEFAULT ? NULL :
+ mode == CURSOR_NONE ? cursor_none :
+ mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
+
#if defined(TARGET_SDL)
#if defined(TARGET_SDL)
- SDLSetMouseCursor(
mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL
);
+ SDLSetMouseCursor(
cursor_new
);
#elif defined(TARGET_X11_NATIVE)
#elif defined(TARGET_X11_NATIVE)
- X11SetMouseCursor(
mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL
);
+ X11SetMouseCursor(
cursor_new
);
#endif
#endif
}
#endif
#endif
}