X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=129be747af2f74255697c6e5d804fca741543160;hb=94045da2;hp=7614db85fe2c3fd0f1a1391d36f6a16de5927b25;hpb=1e47c9341ba4cc94595bf07b6cac94e1d75fc411;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 7614db85..129be747 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -140,19 +140,6 @@ static char *getScoreCacheDir(char *level_subdir) return score_dir; } -static char *getScoreTapeDir(char *level_subdir, int nr) -{ - static char *score_tape_dir = NULL; - char tape_subdir[MAX_FILENAME_LEN]; - - checked_free(score_tape_dir); - - sprintf(tape_subdir, "%03d", nr); - score_tape_dir = getPath2(getScoreDir(level_subdir), tape_subdir); - - return score_tape_dir; -} - static char *getUserSubdir(int nr) { static char user_subdir[16] = { 0 }; @@ -279,7 +266,7 @@ char *getNewUserLevelSubdir(void) return new_level_subdir; } -static char *getTapeDir(char *level_subdir) +char *getTapeDir(char *level_subdir) { static char *tape_dir = NULL; char *data_dir = getUserGameDataDir(); @@ -686,10 +673,10 @@ char *getScoreTapeFilename(char *basename_no_ext, int nr) checked_free(filename); - sprintf(basename, "%s.%s", basename_no_ext, TAPEFILE_EXTENSION); + sprintf(basename, "%03d.%s.%s", nr, basename_no_ext, TAPEFILE_EXTENSION); // used instead of "leveldir_current->subdir" (for network games) - filename = getPath2(getScoreTapeDir(levelset.identifier, nr), basename); + filename = getPath2(getScoreDir(levelset.identifier), basename); return filename; } @@ -1177,13 +1164,6 @@ void InitScoreCacheDirectory(char *level_subdir) createDirectory(getScoreCacheDir(level_subdir), "level score", PERMS_PRIVATE); } -void InitScoreTapeDirectory(char *level_subdir, int nr) -{ - InitScoreDirectory(level_subdir); - - createDirectory(getScoreTapeDir(level_subdir, nr), "score tape", PERMS_PRIVATE); -} - static void SaveUserLevelInfo(void); void InitUserLevelDirectory(char *level_subdir) @@ -4848,7 +4828,7 @@ static void SaveLevelSetup_LastSeries_Ext(boolean deactivate_last_level_series) for (i = 0; last_level_series[i] != NULL; i++) { - char token[strlen(TOKEN_STR_LAST_LEVEL_SERIES) + 10]; + char token[strlen(TOKEN_STR_LAST_LEVEL_SERIES) + 1 + 10 + 1]; sprintf(token, "%s.%03d", TOKEN_STR_LAST_LEVEL_SERIES, i);