SaveState: Keep an undo for each slot by default.

This commit is contained in:
Unknown W. Brackets committed 2018-03-17 23:18:25 -07:00
1 parent a966403def
commit 2ee8dd7752
4 files changed
+47 -2

No files matched your search

+41 -2
View File
@@ -411,11 +411,16 @@ namespace SaveState
{
std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
std::string shot = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);
std::string fnUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_STATE_EXTENSION);
std::string shotUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_SCREENSHOT_EXTENSION);
if (!fn.empty()) {
auto renameCallback = [=](bool status, const std::string &message, void *data) {
if (status) {
if (File::Exists(fn)) {
File::Delete(fn);
if (File::Exists(fnUndo) && g_Config.bEnableStateUndo) {
File::Delete(fnUndo);
}
if (File::Exists(fn) && g_Config.bEnableStateUndo) {
File::Rename(fn, fnUndo);
}
File::Rename(fn + ".tmp", fn);
}
@@ -424,6 +429,9 @@ namespace SaveState
}
};
// Let's also create a screenshot.
if (File::Exists(shot) && g_Config.bEnableStateUndo) {
File::Rename(shot, shotUndo);
}
SaveScreenshot(shot, Callback(), 0);
Save(fn + ".tmp", renameCallback, cbUserData);
} else {
@@ -433,12 +441,43 @@ namespace SaveState
}
}
bool UndoSaveSlot(const std::string &gameFilename, int slot) {
std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
std::string shot = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);
std::string fnUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_STATE_EXTENSION);
std::string shotUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_SCREENSHOT_EXTENSION);
// Do nothing if there's no undo.
if (File::Exists(fnUndo)) {
// Swap them so they can undo again to redo. Mistakes happen.
if (File::Exists(shotUndo)) {
File::Rename(shot, shot + ".tmp");
File::Rename(shotUndo, shot);
File::Rename(shot + ".tmp", shotUndo);
}
File::Rename(fn, fn + ".tmp");
File::Rename(fnUndo, fn);
File::Rename(fn + ".tmp", fnUndo);
return true;
}
return false;
}
bool HasSaveInSlot(const std::string &gameFilename, int slot)
{
std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
return File::Exists(fn);
}
bool HasUndoSaveInSlot(const std::string &gameFilename, int slot)
{
std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
return File::Exists(fn + ".undo");
}
bool HasScreenshotInSlot(const std::string &gameFilename, int slot)
{
std::string fn = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);