X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=defacd4e5ff9130afa3ff01b33b1fd476a5293a1;hb=eb307f1cc053ffdead7e4b50503b6b54f9a9c412;hp=03d9bfd8fc0d8aa91a2e143db48266b775b1118f;hpb=89401883eeb279c7101b1c635477a9bccc123d21;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 03d9bfd8..defacd4e 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1400,7 +1400,10 @@ char *getUserGameDataDir(void)
 
 #if defined(PLATFORM_ANDROID)
   if (user_game_data_dir == NULL)
-    user_game_data_dir = (char *)SDL_AndroidGetInternalStoragePath();
+    user_game_data_dir = (char *)(SDL_AndroidGetExternalStorageState() &
+				  SDL_ANDROID_EXTERNAL_STORAGE_WRITE ?
+				  SDL_AndroidGetExternalStoragePath() :
+				  SDL_AndroidGetInternalStoragePath());
 #else
   if (user_game_data_dir == NULL)
     user_game_data_dir = getPath2(getPersonalDataDir(),
@@ -1952,7 +1955,7 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename,
 
   if (!(file = openFile(filename, MODE_READ)))
   {
-    Error(ERR_WARN, "cannot open configuration file '%s'", filename);
+    Error(ERR_DEBUG, "cannot open configuration file '%s'", filename);
 
     return FALSE;
   }
@@ -3681,7 +3684,9 @@ void LoadLevelSetup_LastSeries()
     freeSetupFileHash(level_setup_hash);
   }
   else
-    Error(ERR_WARN, "using default setup values");
+  {
+    Error(ERR_DEBUG, "using default setup values");
+  }
 
   free(filename);
 }
@@ -3849,7 +3854,9 @@ void LoadLevelSetup_SeriesInfo()
     freeSetupFileHash(level_setup_hash);
   }
   else
-    Error(ERR_WARN, "using default setup values");
+  {
+    Error(ERR_DEBUG, "using default setup values");
+  }
 
   free(filename);
 }