projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused array for SDL key state
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index f824ac511c0dd5d81318e8b643846d318de77650..a1f009f77c8470f5d0b7e0fcbe85eb97db53ecd0 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-624,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;
@@
-938,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;
@@
-1662,6
+1668,8
@@
void OpenAudio(void)
audio.device_name = NULL;
audio.device_fd = -1;
audio.device_name = NULL;
audio.device_fd = -1;
+ audio.sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
+
audio.num_channels = 0;
audio.music_channel = 0;
audio.first_sound_channel = 0;
audio.num_channels = 0;
audio.music_channel = 0;
audio.first_sound_channel = 0;