X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=3881d202338a5d3ab1971a35cf080fab644b2241;hb=cdc3c940197937b0508a1eb7dcf44874951908b7;hp=a3c3247978f80b38b24759f5d34bfbf6fc7871c1;hpb=f8f691137746b187cca2f997604a2336882b5cd9;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index a3c32479..3881d202 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -578,10 +578,18 @@ void GetOptions(char *argv[], void (*print_usage_function)(void))
   char *rw_base_path = RW_BASE_PATH;
   char **options_left = &argv[1];
 
+#if !defined(PLATFORM_MACOSX)
+  /* if the program is configured to start from current directory (default),
+     determine program package directory (KDE/Konqueror does not do this by
+     itself and fails otherwise); on Mac OS X, the program binary is stored
+     in an application package directory -- do not try to use this directory
+     as the program data directory (Mac OS X handles this correctly anyway) */
+
   if (strcmp(ro_base_path, ".") == 0)
     ro_base_path = program.command_basepath;
   if (strcmp(rw_base_path, ".") == 0)
     rw_base_path = program.command_basepath;
+#endif
 
   /* initialize global program options */
   options.display_name = NULL;
@@ -2122,6 +2130,10 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info,
     boolean base_prefix_found = FALSE;
     boolean parameter_suffix_found = FALSE;
 
+#if 0
+    printf("::: examining '%s' -> '%s'\n", token, HASH_ITERATION_VALUE(itr));
+#endif
+
     /* skip all parameter definitions (handled by read_token_parameters()) */
     for (i = 0; i < num_suffix_list_entries && !parameter_suffix_found; i++)
     {