libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 10:21:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGS: Fix regression when trying to delete files

Browse Source 
This for examples fixes deleting savegames from the ingame save
dialog in QfG2 AGDI.

The issue is that the file name we get from get_save_game_path(int)
in DeleteSaveSlot(int) contains the "/saves/" prefix, so we
cannot directly pass it to the ScummVM savefile manager.
This commit is contained in:
Thierry Crozat 2021-06-21 21:41:58 +01:00
parent edaabb3d9d
commit 30764bbc41
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ags/engine/ac/file.cpp
View File

@ -73,10 +73,10 @@ int File_Delete(const char *fnmm) {
if (!ResolveScriptPath(fnmm, false, rp))
return 0;
if (::remove(rp.FullPath.GetCStr()) == 0)
if (File::DeleteFile(rp.FullPath))
return 1;
if (_G(errnum) == AL_ENOENT && !rp.AltPath.IsEmpty() && rp.AltPath.Compare(rp.FullPath) != 0)
return ::remove(rp.AltPath.GetCStr()) == 0 ? 1 : 0;
return File::DeleteFile(rp.AltPath) ? 1 : 0;
return 0;
}

3
engines/ags/engine/ac/global_game.cpp
View File

@ -111,8 +111,7 @@ void RestoreGameSlot(int slnum) {
void DeleteSaveSlot(int slnum) {
String nametouse;
nametouse = get_save_game_path(slnum);
g_system->getSavefileManager()->removeSavefile(nametouse);
Shared::File::DeleteFile(nametouse);
}
void PauseGame() {