X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=1e628241f9eedb648019b17d71940aeb75ca3579;hb=ea933dd51bfca7ddcc6b75465476cce57afd1682;hp=a075e6d1ceb3cd5a9979ba45266b904ec84f563a;hpb=ff2510f5098b545a03965c6b95296eec6885a4fb;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index a075e6d1..1e628241 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;
@@ -68,10 +66,31 @@ int			FrameCounter = 0;
 /* init/close functions                                                      */
 /* ========================================================================= */
 
-void InitCommandName(char *argv0)
+void InitProgramInfo(char *argv0,
+		     char *userdata_directory, char *program_title,
+		     char *window_title, char *icon_title,
+		     char *x11_icon_filename, char *x11_iconmask_filename,
+		     char *msdos_pointer_filename,
+		     char *cookie_prefix, char *filename_prefix,
+		     int program_version)
 {
   program.command_basename =
     (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0);
+
+  program.userdata_directory = userdata_directory;
+  program.program_title = program_title;
+  program.window_title = window_title;
+  program.icon_title = icon_title;
+  program.x11_icon_filename = x11_icon_filename;
+  program.x11_iconmask_filename = x11_iconmask_filename;
+  program.msdos_pointer_filename = msdos_pointer_filename;
+
+  program.cookie_prefix = cookie_prefix;
+  program.filename_prefix = filename_prefix;
+
+  program.version_major = VERSION_MAJOR(program_version);
+  program.version_minor = VERSION_MINOR(program_version);
+  program.version_patch = VERSION_PATCH(program_version);
 }
 
 void InitExitFunction(void (*exit_function)(int))
@@ -92,13 +111,6 @@ void InitPlatformDependantStuff(void)
 {
 #if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
-#endif
-
-#if !defined(PLATFORM_UNIX)
-  program.userdata_directory = "userdata";
-#endif
-
-#if defined(PLATFORM_MSDOS)
   initErrorFile();
 #endif
 
@@ -115,34 +127,6 @@ void ClosePlatformDependantStuff(void)
 #endif
 }
 
-void InitProgramInfo(char *unix_userdata_directory, char *program_title,
-		     char *window_title, char *icon_title,
-		     char *x11_icon_filename, char *x11_iconmask_filename,
-		     char *msdos_pointer_filename,
-		     char *cookie_prefix, char *filename_prefix,
-		     int program_version)
-{
-#if defined(PLATFORM_UNIX)
-  program.userdata_directory = unix_userdata_directory;
-#else
-  program.userdata_directory = "userdata";
-#endif
-
-  program.program_title = program_title;
-  program.window_title = window_title;
-  program.icon_title = icon_title;
-  program.x11_icon_filename = x11_icon_filename;
-  program.x11_iconmask_filename = x11_iconmask_filename;
-  program.msdos_pointer_filename = msdos_pointer_filename;
-
-  program.cookie_prefix = cookie_prefix;
-  program.filename_prefix = filename_prefix;
-
-  program.version_major = VERSION_MAJOR(program_version);
-  program.version_minor = VERSION_MINOR(program_version);
-  program.version_patch = VERSION_PATCH(program_version);
-}
-
 void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
 		      int real_sx, int real_sy,
 		      int full_sxsize, int full_sysize)
@@ -572,7 +556,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 +864,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 +877,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