[Scummvm-cvs-logs] scummvm master -> 7fde01b65815c9e4ed70958f3d2d97af7df4589b

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7fde01b658 LAB: Remove gap handling from removeSaveState.


Commit: 7fde01b65815c9e4ed70958f3d2d97af7df4589b
    https://github.com/scummvm/scummvm/commit/7fde01b65815c9e4ed70958f3d2d97af7df4589b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-08T19:07:48+01:00

Commit Message:
LAB: Remove gap handling from removeSaveState.

This removes the annoying behavior that removing a save state causes your
physical files to be renamed.

Changed paths:
    engines/lab/detection.cpp



diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index 9fe4a16..1fd3ca8 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -197,26 +197,7 @@ int LabMetaEngine::getMaximumSaveSlot() const {
 
 void LabMetaEngine::removeSaveState(const char *target, int slot) const {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	Common::String filename = Common::String::format("%s.%03u", target, slot);
-
-	saveFileMan->removeSavefile(filename.c_str());
-
-	Common::StringArray filenames;
-	Common::String pattern = target;
-	pattern += ".###";
-	filenames = saveFileMan->listSavefiles(pattern.c_str());
-	Common::sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)
-
-	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
-		// Obtain the last 3 digits of the filename, since they correspond to the save slot
-		int slotNum = atoi(file->c_str() + file->size() - 3);
-
-		// Rename every slot greater than the deleted slot,
-		if (slotNum > slot) {
-			saveFileMan->renameSavefile(file->c_str(), filename.c_str());
-			filename = Common::String::format("%s.%03u", target, ++slot);
-		}
-	}
+	saveFileMan->removeSavefile(Common::String::format("%s.%03u", target, slot));
 }
 
 SaveStateDescriptor LabMetaEngine::querySaveMetaInfos(const char *target, int slot) const {