[Scummvm-git-logs] scummvm master -> 8f6d8f7f68002d559a9c62c863edfc65c9dc8618

[bonki]

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

Summary:
25535c10c2 XEEN: Let listSaves return list sorted on slot numbers
77a6a9a30c COMPOSER: Let listSaves return list sorted on slot numbers
8ed5969ea1 PRINCE: Let listSaves return list sorted on slot numbers
114bedc5fe SHERLOCK: Let listSaves return list sorted on slot numbers
8f6d8f7f68 MORTEVIELLE: Let listSaves return list sorted on slot numbers


Commit: 25535c10c2f8ce70d50e719f5debaf2ee6840d74
    https://github.com/scummvm/scummvm/commit/25535c10c2f8ce70d50e719f5debaf2ee6840d74
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-26T01:07:31+02:00

Commit Message:
XEEN: Let listSaves return list sorted on slot numbers

Changed paths:
    engines/xeen/detection.cpp


diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index cf033b6..cc1bdde 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -141,7 +141,6 @@ SaveStateList XeenMetaEngine::listSaves(const char *target) const {
 	Xeen::XeenSavegameHeader header;
 
 	filenames = saveFileMan->listSavefiles(pattern);
-	sort(filenames.begin(), filenames.end());   // Sort to get the files in numerical order
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -163,6 +162,7 @@ SaveStateList XeenMetaEngine::listSaves(const char *target) const {
 		}
 	}
 
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }
 


Commit: 77a6a9a30c37f39d1b3eab7ac709456ac8e04cb1
    https://github.com/scummvm/scummvm/commit/77a6a9a30c37f39d1b3eab7ac709456ac8e04cb1
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-26T01:07:31+02:00

Commit Message:
COMPOSER: Let listSaves return list sorted on slot numbers

Changed paths:
    engines/composer/detection.cpp


diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index dd1ce27..72a8f82 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -514,7 +514,6 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
 	Common::String pattern = Common::String::format("%s.??", target);
 
 	filenames = saveFileMan->listSavefiles(pattern);
-	sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -531,6 +530,7 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
 		}
 	}
 
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }
 


Commit: 8ed5969ea1208f3c25fd193dbcdbae9436a7c75d
    https://github.com/scummvm/scummvm/commit/8ed5969ea1208f3c25fd193dbcdbae9436a7c75d
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-26T01:07:32+02:00

Commit Message:
PRINCE: Let listSaves return list sorted on slot numbers

Changed paths:
    engines/prince/detection.cpp


diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index a8fa305..ce80fe5 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -188,7 +188,6 @@ SaveStateList PrinceMetaEngine::listSaves(const char *target) const {
 	pattern += ".###";
 
 	filenames = saveFileMan->listSavefiles(pattern);
-	sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator filename = filenames.begin(); filename != filenames.end(); filename++) {
@@ -224,6 +223,7 @@ SaveStateList PrinceMetaEngine::listSaves(const char *target) const {
 		}
 	}
 
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }
 


Commit: 114bedc5fe325bef71dbb07eec402cf9b00e895c
    https://github.com/scummvm/scummvm/commit/114bedc5fe325bef71dbb07eec402cf9b00e895c
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-26T01:07:32+02:00

Commit Message:
SHERLOCK: Let listSaves return list sorted on slot numbers

Changed paths:
    engines/sherlock/saveload.cpp


diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 44b5e10..9d203a6 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -93,7 +93,6 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 	SherlockSavegameHeader header;
 
 	filenames = saveFileMan->listSavefiles(pattern);
-	sort(filenames.begin(), filenames.end());   // Sort to get the files in numerical order
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -116,6 +115,7 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 		}
 	}
 
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }
 


Commit: 8f6d8f7f68002d559a9c62c863edfc65c9dc8618
    https://github.com/scummvm/scummvm/commit/8f6d8f7f68002d559a9c62c863edfc65c9dc8618
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-26T01:07:32+02:00

Commit Message:
MORTEVIELLE: Let listSaves return list sorted on slot numbers

Changed paths:
    engines/mortevielle/saveload.cpp


diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index 3065d6c..3032c96 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -240,7 +240,6 @@ SaveStateList SavegameManager::listSaves(const Common::String &target) {
 	pattern += ".###";
 
 	Common::StringArray files = g_system->getSavefileManager()->listSavefiles(pattern);
-	sort(files.begin(), files.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = files.begin(); file != files.end(); ++file) {
@@ -282,6 +281,7 @@ SaveStateList SavegameManager::listSaves(const Common::String &target) {
 		}
 	}
 
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }