projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added description for BD style explosion
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 2fad22274b84e09fc5bdac61421b860f511265ab..37fe3a77cab0821c1bd30d4c8a5f07548aec3125 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-121,7
+121,7
@@
void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly,
network.is_server_thread = FALSE;
}
network.is_server_thread = FALSE;
}
-void InitRuntimeInfo()
+void InitRuntimeInfo(
void
)
{
#if defined(HAS_TOUCH_DEVICE)
runtime.uses_touch_device = TRUE;
{
#if defined(HAS_TOUCH_DEVICE)
runtime.uses_touch_device = TRUE;
@@
-599,15
+599,20
@@
void FreeBitmap(Bitmap *bitmap)
free(bitmap);
}
free(bitmap);
}
+void ResetBitmapAlpha(Bitmap *bitmap)
+{
+ bitmap->alpha[0][0] = -1;
+ bitmap->alpha[0][1] = -1;
+ bitmap->alpha[1][0] = -1;
+ bitmap->alpha[1][1] = -1;
+ bitmap->alpha_next_blit = -1;
+}
+
Bitmap *CreateBitmapStruct(void)
{
Bitmap *new_bitmap = checked_calloc(sizeof(Bitmap));
Bitmap *CreateBitmapStruct(void)
{
Bitmap *new_bitmap = checked_calloc(sizeof(Bitmap));
- new_bitmap->alpha[0][0] = -1;
- new_bitmap->alpha[0][1] = -1;
- new_bitmap->alpha[1][0] = -1;
- new_bitmap->alpha[1][1] = -1;
- new_bitmap->alpha_next_blit = -1;
+ ResetBitmapAlpha(new_bitmap);
return new_bitmap;
}
return new_bitmap;
}
@@
-619,7
+624,7
@@
Bitmap *CreateBitmap(int width, int height, int depth)
int real_height = MAX(1, height); // prevent zero bitmap height
int real_depth = GetRealDepth(depth);
int real_height = MAX(1, height); // prevent zero bitmap height
int real_depth = GetRealDepth(depth);
-
SDLCreateBitmapContent(new_bitmap,
real_width, real_height, real_depth);
+
new_bitmap->surface = SDLCreateNativeSurface(
real_width, real_height, real_depth);
new_bitmap->width = real_width;
new_bitmap->height = real_height;
new_bitmap->width = real_width;
new_bitmap->height = real_height;
@@
-933,6
+938,12
@@
void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
int src_x, int src_y, int width, int height,
int dst_x, int dst_y)
{
int src_x, int src_y, int width, int height,
int dst_x, int dst_y)
{
+ if (program.headless)
+ return;
+
+ if (src_bitmap == NULL || dst_bitmap == NULL)
+ return;
+
if (DrawingDeactivated(dst_x, dst_y))
return;
if (DrawingDeactivated(dst_x, dst_y))
return;