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

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 03d9bfd8..4e81beb6 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;
   }
@@ -2350,28 +2353,28 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
     ti->imported_by = getStringCopy(parent->imported_by);
     ti->tested_by = getStringCopy(parent->tested_by);
 
-    ti->graphics_set_ecs = NULL;
-    ti->graphics_set_aga = NULL;
-    ti->graphics_set = NULL;
-    ti->sounds_set = NULL;
-    ti->music_set = NULL;
+    ti->graphics_set_ecs = getStringCopy(parent->graphics_set_ecs);
+    ti->graphics_set_aga = getStringCopy(parent->graphics_set_aga);
+    ti->graphics_set = getStringCopy(parent->graphics_set);
+    ti->sounds_set = getStringCopy(parent->sounds_set);
+    ti->music_set = getStringCopy(parent->music_set);
     ti->graphics_path = getStringCopy(UNDEFINED_FILENAME);
     ti->sounds_path = getStringCopy(UNDEFINED_FILENAME);
     ti->music_path = getStringCopy(UNDEFINED_FILENAME);
 
-    ti->level_filename = NULL;
-    ti->level_filetype = NULL;
+    ti->level_filename = getStringCopy(parent->level_filename);
+    ti->level_filetype = getStringCopy(parent->level_filetype);
 
     ti->special_flags = getStringCopy(parent->special_flags);
 
-    ti->levels = 0;
-    ti->first_level = 0;
-    ti->last_level = 0;
+    ti->levels = parent->levels;
+    ti->first_level = parent->first_level;
+    ti->last_level = parent->last_level;
     ti->level_group = FALSE;
-    ti->handicap_level = 0;
+    ti->handicap_level = parent->handicap_level;
     ti->readonly = parent->readonly;
-    ti->handicap = TRUE;
-    ti->skip_levels = FALSE;
+    ti->handicap = parent->handicap;
+    ti->skip_levels = parent->skip_levels;
   }
 }
 
@@ -3516,6 +3519,8 @@ static void SaveUserLevelInfo()
   setString(&level_info->author, getRealName());
   level_info->levels = 100;
   level_info->first_level = 1;
+  level_info->sort_priority = LEVELCLASS_PRIVATE_START;
+  level_info->readonly = FALSE;
 
   token_value_position = TOKEN_VALUE_POSITION_SHORT;
 
@@ -3527,7 +3532,9 @@ static void SaveUserLevelInfo()
     if (i == LEVELINFO_TOKEN_NAME ||
 	i == LEVELINFO_TOKEN_AUTHOR ||
 	i == LEVELINFO_TOKEN_LEVELS ||
-	i == LEVELINFO_TOKEN_FIRST_LEVEL)
+	i == LEVELINFO_TOKEN_FIRST_LEVEL ||
+	i == LEVELINFO_TOKEN_SORT_PRIORITY ||
+	i == LEVELINFO_TOKEN_READONLY)
       fprintf(file, "%s\n", getSetupLine(levelinfo_tokens, "", i));
 
     /* just to make things nicer :) */
@@ -3681,7 +3688,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 +3858,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);
 }