AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-27 15:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1302 from fabiangreffrath/auto_organize_savefiles

Browse Source 
enable "Organize save files" if no savegame found in old location
This commit is contained in:
Fabian Greffrath 2023-12-05 20:28:45 +01:00 committed by GitHub
commit aec003bb3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/d_main.c
View File

@ -2451,34 +2451,49 @@ void D_DoomMain(void)
PrintVersion(); PrintVersion();
if (!M_CheckParm("-save") && organize_savefiles) if (!M_CheckParm("-save"))
{ {
int i; if (organize_savefiles == -1)
char *wadname = wadfiles[0], *oldsavegame = basesavegame;
for (i = mainwadfile; i < numwadfiles; i++)
{ {
if (FileContainsMaps(wadfiles[i])) // [FG] check for at least one savegame in the old location
{ glob_t *glob = I_StartMultiGlob(basesavegame,
wadname = wadfiles[i]; GLOB_FLAG_NOCASE|GLOB_FLAG_SORTED,
break; "*.dsg", NULL);
}
organize_savefiles = (I_NextGlob(glob) == NULL);
I_EndGlob(glob);
} }
basesavegame = M_StringJoin(oldsavegame, DIR_SEPARATOR_S, if (organize_savefiles)
"savegames", NULL); {
free(oldsavegame); int i;
char *wadname = wadfiles[0], *oldsavegame = basesavegame;
NormalizeSlashes(basesavegame); for (i = mainwadfile; i < numwadfiles; i++)
M_MakeDirectory(basesavegame); {
if (FileContainsMaps(wadfiles[i]))
{
wadname = wadfiles[i];
break;
}
}
oldsavegame = basesavegame; basesavegame = M_StringJoin(oldsavegame, DIR_SEPARATOR_S,
basesavegame = M_StringJoin(oldsavegame, DIR_SEPARATOR_S, "savegames", NULL);
M_BaseName(wadname), NULL); free(oldsavegame);
free(oldsavegame);
NormalizeSlashes(basesavegame); NormalizeSlashes(basesavegame);
M_MakeDirectory(basesavegame); M_MakeDirectory(basesavegame);
oldsavegame = basesavegame;
basesavegame = M_StringJoin(oldsavegame, DIR_SEPARATOR_S,
M_BaseName(wadname), NULL);
free(oldsavegame);
NormalizeSlashes(basesavegame);
M_MakeDirectory(basesavegame);
}
} }
I_Printf(VB_INFO, "Savegame directory: %s\n", basesavegame); I_Printf(VB_INFO, "Savegame directory: %s\n", basesavegame);

2
src/m_misc.c
View File

@ -626,7 +626,7 @@ default_t defaults[] = {
{ {
"organize_savefiles", "organize_savefiles",
(config_t *) &organize_savefiles, NULL, (config_t *) &organize_savefiles, NULL,
{0}, {0,1}, number, ss_gen, wad_no, {-1}, {-1,1}, number, ss_gen, wad_no,
"1 to organize save files" "1 to organize save files"
}, },