X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=b5e4f270c284fbde5d20661d1fb7322fb6b81fcd;hb=4c97b1045b53135f75e9324747abb5e9286b813d;hp=2efe6dd991da2d4c8d380aca2f2ddcbc2dd9d4e8;hpb=f89a490028c36509216b97a96b779b779c2065c9;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 2efe6dd9..b5e4f270 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -63,8 +63,7 @@ int			FrameCounter = 0;
 /* init/close functions                                                      */
 /* ========================================================================= */
 
-void InitProgramInfo(char *argv0, char *config_filename,
-		     char *userdata_subdir, char *userdata_subdir_unix,
+void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir,
 		     char *program_title, char *icon_title,
 		     char *icon_filename, char *cookie_prefix,
 		     int program_version)
@@ -75,7 +74,6 @@ void InitProgramInfo(char *argv0, char *config_filename,
   program.config_filename = config_filename;
 
   program.userdata_subdir = userdata_subdir;
-  program.userdata_subdir_unix = userdata_subdir_unix;
   program.userdata_path = getUserGameDataDir();
 
   program.program_title = program_title;
@@ -120,7 +118,7 @@ void InitExitFunction(void (*exit_function)(int))
   program.exit_function = exit_function;
 
   /* set signal handlers to custom exit function */
-  signal(SIGINT, exit_function);
+  // signal(SIGINT, exit_function);
   signal(SIGTERM, exit_function);
 
   /* set exit function to automatically cleanup SDL stuff after exit() */
@@ -132,10 +130,6 @@ void InitPlatformDependentStuff(void)
   // this is initialized in GetOptions(), but may already be used before
   options.verbose = TRUE;
 
-#if defined(PLATFORM_MACOSX)
-  updateUserGameDataDir();
-#endif
-
   OpenLogFiles();
 
 #if defined(TARGET_SDL2)
@@ -851,7 +845,7 @@ Bitmap *LoadCustomImage(char *basename)
     Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
-    Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
+    Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError());
 
   return new_bitmap;
 }
@@ -878,7 +872,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
   {
-    Error(ERR_WARN, "LoadImage() failed: %s", GetError());
+    Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError());
     return;
   }