X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=0131c133e7543bb252a2fd76963ce794582b4984;hb=f4b305df0ae775ef48daee86020904abb79ebef8;hp=7ec7d7df5aa37ac0f59ef2f7a2c6a63826716048;hpb=56c6c0e7a97a0831480dd9fdac411923b046ba38;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 7ec7d7df..0131c133 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -36,8 +36,6 @@ struct OptionInfo	options;
 struct VideoSystemInfo	video;
 struct AudioSystemInfo	audio;
 struct GfxInfo		gfx;
-struct FontInfo		font;
-struct AnimInfo		anim;
 struct ArtworkInfo	artwork;
 struct JoystickInfo	joystick;
 struct SetupInfo	setup;
@@ -572,7 +570,7 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 				   int width, int height,
 				   int dst_x, int dst_y)
 {
-  if (DrawingOnBackground(src_x, src_y))
+  if (DrawingOnBackground(dst_x, dst_y))
   {
     /* draw background */
     BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height,
@@ -880,7 +878,7 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
 
 void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
 {
-  Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_4, *tmp_bitmap_8;
+  Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8;
   int src_width, src_height;
   int tmp_width, tmp_height;
 
@@ -893,19 +891,15 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
   tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH);
 
   tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2);
-  tmp_bitmap_4 = ZoomBitmap(src_bitmap, src_width / 4, src_height / 4);
   tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8);
 
   BlitBitmap(src_bitmap, tmp_bitmap, 0, 0, src_width, src_height, 0, 0);
   BlitBitmap(tmp_bitmap_2, tmp_bitmap, 0, 0, src_width / 2, src_height / 2,
 	     0, src_height);
-  BlitBitmap(tmp_bitmap_4, tmp_bitmap, 0, 0, src_width / 4, src_height / 4,
-	     src_width / 2, src_height);
   BlitBitmap(tmp_bitmap_8, tmp_bitmap, 0, 0, src_width / 8, src_height / 8,
 	     3 * src_width / 4, src_height);
 
   FreeBitmap(tmp_bitmap_2);
-  FreeBitmap(tmp_bitmap_4);
   FreeBitmap(tmp_bitmap_8);
 
 #ifdef TARGET_SDL
@@ -937,7 +931,7 @@ inline void OpenAudio(void)
   audio.sound_deactivated = FALSE;
 
   audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0;
-  audio.mixer_pid = -1;
+  audio.mixer_pid = 0;
   audio.device_name = NULL;
   audio.device_fd = -1;