projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed drawing of global borders to more generic approach (again)
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 053409c67ae6c09e139aa62d22617149e29cdc12..d72c99d09329fd1081e3ce962909089b4ca2fe85 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-291,15
+291,16
@@
void RedrawPlayfield()
static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
int draw_target)
{
static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
int draw_target)
{
- Bitmap *bitmap = getGlobalBorderBitmapFromStatus(global.border_status);
+ Bitmap *src_bitmap = getGlobalBorderBitmapFromStatus(global.border_status);
+ Bitmap *dst_bitmap = gfx.masked_border_bitmap_ptr;
if (x == -1 && y == -1)
return;
if (draw_target == DRAW_BORDER_TO_SCREEN)
if (x == -1 && y == -1)
return;
if (draw_target == DRAW_BORDER_TO_SCREEN)
- BlitToScreenMasked(bitmap, x, y, width, height, x, y);
+ BlitToScreenMasked(
src_
bitmap, x, y, width, height, x, y);
else
else
- BlitBitmapMasked(
bitmap, backbuffer
, x, y, width, height, x, y);
+ BlitBitmapMasked(
src_bitmap, dst_bitmap
, x, y, width, height, x, y);
}
static void DrawMaskedBorderExt_FIELD(int draw_target)
}
static void DrawMaskedBorderExt_FIELD(int draw_target)
@@
-381,7
+382,7
@@
void DrawMaskedBorder(int redraw_mask)
DrawMaskedBorderExt(redraw_mask, DRAW_BORDER_TO_BACKBUFFER);
}
DrawMaskedBorderExt(redraw_mask, DRAW_BORDER_TO_BACKBUFFER);
}
-void DrawMaskedBorderTo
Screen
(int draw_target)
+void DrawMaskedBorderTo
Target
(int draw_target)
{
DrawMaskedBorderExt(REDRAW_ALL, draw_target);
}
{
DrawMaskedBorderExt(REDRAW_ALL, draw_target);
}