[Scummvm-cvs-logs] scummvm master -> d7bb90ba84615f9e261118abb13d88b316cb92d7
lordhoto
lordhoto at gmail.com
Thu Feb 25 21:41:27 CET 2016
This automated email contains information about 40 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a155220100 ENGINES: Add comparator to sort SaveStateDescriptors based on slot.
cf685fbc6c ACCESS: Let listSaves return list sorted on slot numbers.
f3f37af61b AGI: Let listSaves return list sorted on slot numbers.
99c59cdeb2 AGOS: Let listSaves return list sorted on slot numbers.
e31a4a409e AVALANCHE: Let listSaves return list sorted on slot numbers.
7daa2ab6fd BBVS: Let listSaves return list sorted on slot numbers.
e428dfc744 CGE: Let listSaves return list sorted on slot numbers.
8fce4b5f19 CGE2: Let listSaves return list sorted on slot numbers.
0308717744 CINE: Let listSaves return list sorted on slot numbers.
a8d9478e46 CRUISE: Let listSaves return list sorted on slot numbers.
0170982a53 DRACI: Let listSaves return list sorted on slot numbers.
c5c1209edd DRASCULA: Let listSaves return list sorted on slot numbers.
3def363968 DREAMWEB: Let listSaves return list sorted on slot numbers.
e5feb43392 FULLPIPE: Let listSaves return list sorted on slot numbers.
6452939b18 HOPKINS: Let listSaves return list sorted on slot numbers.
1e74033618 HUGO: Let listSaves return list sorted on slot numbers.
56fc42c2f7 KYRA: Let listSaves return list sorted on slot numbers.
c31fdb1efc LAB: Let listSaves return list sorted on slot numbers.
4892a83cf6 LURE: Let listSaves return list sorted on slot numbers.
bed73e6cfa MADS: Let listSaves return list sorted on slot numbers.
37c1a06df9 NEVERHOOD: Let listSaves return list sorted on slot numbers.
c5f4197fd0 PARALLACTION: Let listSaves return list sorted on slot numbers.
cb07a1bb1d QUEEN: Let listSaves return list sorted on slot numbers.
ce8998760d SAGA: Let listSaves return list sorted on slot numbers.
cea96e4a39 SCI: Let listSaves return list sorted on slot numbers.
d1cf867fc4 SCUMM: Let listSaves return list sorted on slot numbers.
265ed503c1 SKY: Let listSaves return list sorted on slot numbers.
d740bc4f2e SWORD1: Let listSaves return list sorted on slot numbers.
0b93e1b004 SWORD2: Let listSaves return list sorted on slot numbers.
525e5edd30 TEENAGENT: Let listSaves return list sorted on slot numbers.
cae26227a0 TINSEL: Let listSaves return list sorted on slot numbers.
de609c0a92 TOLTECS: Let listSaves return list sorted on slot numbers.
2da54704af TONY: Let listSaves return list sorted on slot numbers.
d7ae0df8e1 TOON: Let listSaves return list sorted on slot numbers.
6d46577174 TSAGE: Let listSaves return list sorted on slot numbers.
0aea4b59df TUCKER: Let listSaves return list sorted on slot numbers.
9eed3e15fb VOYEUR: Let listSaves return list sorted on slot numbers.
2b53a26bb4 WAGE: Let listSaves return list sorted on slot numbers.
d38a22011e ZVISION: Let listSaves return list sorted on slot numbers.
d7bb90ba84 ENGINES: Document sorting guaranty for MetaEngine::listSaves.
Commit: a155220100205fef939892ca5d605ea2af24d5ba
https://github.com/scummvm/scummvm/commit/a155220100205fef939892ca5d605ea2af24d5ba
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
ENGINES: Add comparator to sort SaveStateDescriptors based on slot.
Changed paths:
engines/savestate.h
diff --git a/engines/savestate.h b/engines/savestate.h
index 54eff0f..21ade60 100644
--- a/engines/savestate.h
+++ b/engines/savestate.h
@@ -27,7 +27,6 @@
#include "common/str.h"
#include "common/ptr.h"
-
namespace Graphics {
struct Surface;
}
@@ -205,5 +204,13 @@ private:
/** List of savestates. */
typedef Common::Array<SaveStateDescriptor> SaveStateList;
+/**
+ * Comparator object to compare SaveStateDescriptor's based on slot.
+ */
+struct SaveStateDescriptorSlotComparator {
+ bool operator()(const SaveStateDescriptor &x, const SaveStateDescriptor &y) const {
+ return x.getSaveSlot() < y.getSaveSlot();
+ }
+};
#endif
Commit: cf685fbc6c6d3c91f0ff741567aec1efbcd35e9c
https://github.com/scummvm/scummvm/commit/cf685fbc6c6d3c91f0ff741567aec1efbcd35e9c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
ACCESS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/access/detection.cpp
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 7494c9c..2cd7e50 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -146,7 +146,6 @@ SaveStateList AccessMetaEngine::listSaves(const char *target) const {
Access::AccessSavegameHeader 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) {
@@ -167,6 +166,8 @@ SaveStateList AccessMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: f3f37af61b9639d67b113035987182d9eef8c120
https://github.com/scummvm/scummvm/commit/f3f37af61b9639d67b113035987182d9eef8c120
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
AGI: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/agi/detection.cpp
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 7d5243e..3efd6bd 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -261,7 +261,6 @@ SaveStateList AgiMetaEngine::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 file = filenames.begin(); file != filenames.end(); ++file) {
@@ -299,6 +298,8 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 99c59cdeb28ac7e6d80a9343c3b2ca5af9b46b66
https://github.com/scummvm/scummvm/commit/99c59cdeb28ac7e6d80a9343c3b2ca5af9b46b66
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
AGOS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/agos/detection.cpp
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 9444615..82f8ad4 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -186,7 +186,6 @@ SaveStateList AgosMetaEngine::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 file = filenames.begin(); file != filenames.end(); ++file) {
@@ -203,6 +202,8 @@ SaveStateList AgosMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: e31a4a409e21c780653d805201149a1142464813
https://github.com/scummvm/scummvm/commit/e31a4a409e21c780653d805201149a1142464813
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
AVALANCHE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/avalanche/detection.cpp
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 484d148..1ea72b6 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -110,7 +110,6 @@ SaveStateList AvalancheMetaEngine::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) {
@@ -152,6 +151,8 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 7daa2ab6fd04d8d43a24531e679cc8848d345186
https://github.com/scummvm/scummvm/commit/7daa2ab6fd04d8d43a24531e679cc8848d345186
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
BBVS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/bbvs/detection.cpp
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index eb894e9..d2da386 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -116,7 +116,6 @@ SaveStateList BbvsMetaEngine::listSaves(const char *target) const {
pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
- Common::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) {
// Obtain the last 3 digits of the filename, since they correspond to the save slot
@@ -131,6 +130,8 @@ SaveStateList BbvsMetaEngine::listSaves(const char *target) const {
}
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: e428dfc744e85d132798d09c3dad4b460374ffe4
https://github.com/scummvm/scummvm/commit/e428dfc744e85d132798d09c3dad4b460374ffe4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
CGE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/cge/detection.cpp
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 47c5f56..95705cb 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -199,7 +199,6 @@ SaveStateList CGEMetaEngine::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) {
@@ -235,6 +234,8 @@ SaveStateList CGEMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 8fce4b5f19d1fb2eb3075ca0d1f02da0123b5e79
https://github.com/scummvm/scummvm/commit/8fce4b5f19d1fb2eb3075ca0d1f02da0123b5e79
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
CGE2: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/cge2/detection.cpp
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index a1867b0..3ccfffe 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -199,7 +199,6 @@ SaveStateList CGE2MetaEngine::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) {
@@ -235,6 +234,8 @@ SaveStateList CGE2MetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 030871774455aec5368afbc8af757b585aee687a
https://github.com/scummvm/scummvm/commit/030871774455aec5368afbc8af757b585aee687a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
CINE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/cine/detection.cpp
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index dac7add..5e1ffad 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -137,7 +137,6 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
pattern += ".#";
Common::StringArray filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end());
Common::StringArray::const_iterator file;
Common::String filename = target;
@@ -169,6 +168,8 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
delete in;
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: a8d9478e46145ef2c71d6d4d461142c9d8c9b48d
https://github.com/scummvm/scummvm/commit/a8d9478e46145ef2c71d6d4d461142c9d8c9b48d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
CRUISE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/cruise/detection.cpp
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 4d0ed2b..69e1bc4 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -231,7 +231,6 @@ SaveStateList CruiseMetaEngine::listSaves(const char *target) const {
Common::String pattern("cruise.s##");
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) {
@@ -250,6 +249,8 @@ SaveStateList CruiseMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 0170982a53c5b7a620e4ce91ba9a79a2cb4f3fc8
https://github.com/scummvm/scummvm/commit/0170982a53c5b7a620e4ce91ba9a79a2cb4f3fc8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
DRACI: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/draci/detection.cpp
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index a32dae3..82b6935 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -120,7 +120,6 @@ SaveStateList DraciMetaEngine::listSaves(const char *target) const {
Common::String pattern("draci.s##");
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) {
@@ -143,6 +142,8 @@ SaveStateList DraciMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: c5c1209edda8afc6223c028bc4eb2ef54fb4c6cc
https://github.com/scummvm/scummvm/commit/c5c1209edda8afc6223c028bc4eb2ef54fb4c6cc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
DRASCULA: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/drascula/detection.cpp
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index fbf58fa..9a2da1d 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -355,7 +355,6 @@ SaveStateList DrasculaMetaEngine::listSaves(const char *target) const {
pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
int slotNum = 0;
@@ -378,6 +377,8 @@ SaveStateList DrasculaMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 3def36396898c6a683c91d62bde331afdfa1325b
https://github.com/scummvm/scummvm/commit/3def36396898c6a683c91d62bde331afdfa1325b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
DREAMWEB: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/dreamweb/detection.cpp
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 4fc624c..853047c 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -128,7 +128,6 @@ bool DreamWebMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
SaveStateList DreamWebMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray files = saveFileMan->listSavefiles("DREAMWEB.D##");
- Common::sort(files.begin(), files.end());
SaveStateList saveList;
for (uint i = 0; i < files.size(); ++i) {
@@ -146,6 +145,8 @@ SaveStateList DreamWebMetaEngine::listSaves(const char *target) const {
saveList.push_back(sd);
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: e5feb43392f02917f7482a935dc4f04b1f0be250
https://github.com/scummvm/scummvm/commit/e5feb43392f02917f7482a935dc4f04b1f0be250
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
FULLPIPE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/fullpipe/detection.cpp
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index ccd5593..99fbdc4 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -111,7 +111,6 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
Common::String pattern("fullpipe.s##");
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) {
@@ -130,6 +129,8 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 6452939b189ac6c0e895ba9eee39b0028ffcdcbe
https://github.com/scummvm/scummvm/commit/6452939b189ac6c0e895ba9eee39b0028ffcdcbe
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
HOPKINS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/hopkins/detection.cpp
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 670efb8..cc1e84f 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -153,7 +153,6 @@ SaveStateList HopkinsMetaEngine::listSaves(const char *target) const {
Common::String pattern = Common::String::format("%s.0##", target);
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort to get the files in numerical order
Hopkins::hopkinsSavegameHeader header;
@@ -178,6 +177,8 @@ SaveStateList HopkinsMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 1e74033618f4581c41ddaff7b2ebcbd00299513d
https://github.com/scummvm/scummvm/commit/1e74033618f4581c41ddaff7b2ebcbd00299513d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
HUGO: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/hugo/detection.cpp
diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index a005e64..c48a26b 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -180,7 +180,6 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const {
pattern += "-##.SAV";
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
char slot[3];
@@ -217,6 +216,8 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 56fc42c2f7102ed9b2002a10a1b6a7ff8a28fbfd
https://github.com/scummvm/scummvm/commit/56fc42c2f7102ed9b2002a10a1b6a7ff8a28fbfd
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
KYRA: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/kyra/detection.cpp
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index a4786ef..989a45b 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -246,7 +246,6 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern);
- Common::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) {
@@ -269,6 +268,8 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: c31fdb1efcf76c3862dc93aa1ff7e3ea52df6e76
https://github.com/scummvm/scummvm/commit/c31fdb1efcf76c3862dc93aa1ff7e3ea52df6e76
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
LAB: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/lab/detection.cpp
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index d01dff2..b080a80 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -169,7 +169,6 @@ SaveStateList LabMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
- Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)*/
SaveStateList saveList;
@@ -187,6 +186,8 @@ SaveStateList LabMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 4892a83cf625cfb09f70565c0332d9e007a3858b
https://github.com/scummvm/scummvm/commit/4892a83cf625cfb09f70565c0332d9e007a3858b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
LURE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/lure/detection.cpp
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index 902e8af..d0a8ee0 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -245,7 +245,6 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
Common::String pattern = "lure.###";
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) {
@@ -262,6 +261,8 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: bed73e6cfad2b16f0813c898778ab990a2157d69
https://github.com/scummvm/scummvm/commit/bed73e6cfad2b16f0813c898778ab990a2157d69
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
MADS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/mads/detection.cpp
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 0357bd4..b3ba60b 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -192,7 +192,6 @@ SaveStateList MADSMetaEngine::listSaves(const char *target) const {
MADS::MADSSavegameHeader 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) {
@@ -213,6 +212,8 @@ SaveStateList MADSMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 37c1a06df90e8b59c54fd345b3a76ff1399f8644
https://github.com/scummvm/scummvm/commit/37c1a06df90e8b59c54fd345b3a76ff1399f8644
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
NEVERHOOD: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/neverhood/detection.cpp
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 4d545e1..c663d5d 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -245,7 +245,6 @@ SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
- Common::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++) {
@@ -262,6 +261,8 @@ SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: c5f4197fd0f7d5c792ce24ec007d61ba3ed6044b
https://github.com/scummvm/scummvm/commit/c5f4197fd0f7d5c792ce24ec007d61ba3ed6044b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
PARALLACTION: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/parallaction/detection.cpp
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index daeee1f..0c7ebb2 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -273,7 +273,6 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
Common::String pattern(ConfMan.getDomain(target)->getVal("gameid") + ".0##");
Common::StringArray 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) {
@@ -290,6 +289,8 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: cb07a1bb1df4f496b9f6cf4eef3d417d0f991e4e
https://github.com/scummvm/scummvm/commit/cb07a1bb1df4f496b9f6cf4eef3d417d0f991e4e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
QUEEN: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/queen/detection.cpp
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 32c760b..4e87b7e 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -477,7 +477,6 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
Common::String pattern("queen.s##");
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) {
@@ -496,6 +495,8 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: ce8998760d4a3ae5432158754d50b1d5af7b662f
https://github.com/scummvm/scummvm/commit/ce8998760d4a3ae5432158754d50b1d5af7b662f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SAGA: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/saga/detection.cpp
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 13ca635..e201612 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -183,7 +183,6 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const {
pattern += ".s##";
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
int slotNum = 0;
@@ -203,6 +202,8 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: cea96e4a39ee66f3b2ad45cb9b69b373025788c3
https://github.com/scummvm/scummvm/commit/cea96e4a39ee66f3b2ad45cb9b69b373025788c3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SCI: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/sci/detection.cpp
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 05c00bf..985e12a 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -727,7 +727,6 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
int slotNr = 0;
@@ -760,6 +759,8 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: d1cf867fc4fbf12e00dbf0ed2c4a6288cf28703b
https://github.com/scummvm/scummvm/commit/d1cf867fc4fbf12e00dbf0ed2c4a6288cf28703b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SCUMM: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index e5bbad1..9264a64 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1271,7 +1271,6 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
pattern += ".s##";
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) {
@@ -1288,6 +1287,8 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 265ed503c1f0de9adecd4c84577f4c8f63670ab8
https://github.com/scummvm/scummvm/commit/265ed503c1f0de9adecd4c84577f4c8f63670ab8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SKY: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/sky/detection.cpp
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 8a89676..d85299c 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -223,7 +223,6 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
// Find all saves
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles("SKY-VM.###");
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
// Slot 0 is the autosave, if it exists.
// TODO: Check for the existence of the autosave -- but this require us
@@ -243,6 +242,8 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: d740bc4f2e6d3ef40b0c66dd998c3a27d4589658
https://github.com/scummvm/scummvm/commit/d740bc4f2e6d3ef40b0c66dd998c3a27d4589658
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SWORD1: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/sword1/detection.cpp
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 99c4bda..3eac95c 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -241,7 +241,6 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const {
char saveName[40];
Common::StringArray filenames = saveFileMan->listSavefiles("sword1.###");
- sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
int slotNum = 0;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -259,6 +258,8 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 0b93e1b0047497018125bcef98ac03e38d91ec26
https://github.com/scummvm/scummvm/commit/0b93e1b0047497018125bcef98ac03e38d91ec26
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
SWORD2: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/sword2/sword2.cpp
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index baedecb..44371bf 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -234,7 +234,6 @@ SaveStateList Sword2MetaEngine::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 file = filenames.begin(); file != filenames.end(); ++file) {
@@ -252,6 +251,8 @@ SaveStateList Sword2MetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 525e5edd300cd5c717da0c7359411653352ea8d0
https://github.com/scummvm/scummvm/commit/525e5edd300cd5c717da0c7359411653352ea8d0
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TEENAGENT: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/teenagent/detection.cpp
diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
index 4fd3a06..cefc1a8 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -128,7 +128,6 @@ public:
pattern += ".##";
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
- Common::sort(filenames.begin(), filenames.end());
SaveStateList saveList;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -145,6 +144,8 @@ public:
saveList.push_back(SaveStateDescriptor(slot, buf));
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: cae26227a0a7a417f8183edb58e2cbd78b983f8d
https://github.com/scummvm/scummvm/commit/cae26227a0a7a417f8183edb58e2cbd78b983f8d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TINSEL: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/tinsel/detection.cpp
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 7cb2912..0c7d0b0 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -136,7 +136,6 @@ SaveStateList TinselMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
pattern = pattern + ".###";
Common::StringArray files = g_system->getSavefileManager()->listSavefiles(pattern);
- sort(files.begin(), files.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
int slotNum = 0;
@@ -160,6 +159,8 @@ SaveStateList TinselMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: de609c0a925e7ffb388ef66ecf9e70926c9b9c2c
https://github.com/scummvm/scummvm/commit/de609c0a925e7ffb388ef66ecf9e70926c9b9c2c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TOLTECS: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/toltecs/detection.cpp
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index fb7d812..145d954 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -266,7 +266,6 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
- Common::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) {
@@ -284,6 +283,8 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 2da54704af0ddc5d4e11ca46d87ad2c2b898e70b
https://github.com/scummvm/scummvm/commit/2da54704af0ddc5d4e11ca46d87ad2c2b898e70b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TONY: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/tony/detection.cpp
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 2f05c0a..ec0b3e1 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -118,7 +118,6 @@ SaveStateList TonyMetaEngine::listSaves(const char *target) const {
Common::String pattern = "tony.0##";
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) {
@@ -137,6 +136,8 @@ SaveStateList TonyMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: d7ae0df8e105e8d5593a1b92a0834e8c19aece21
https://github.com/scummvm/scummvm/commit/d7ae0df8e105e8d5593a1b92a0834e8c19aece21
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TOON: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/toon/detection.cpp
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index e38ae3d..2ca2bce 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -176,7 +176,6 @@ SaveStateList ToonMetaEngine::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) {
@@ -208,6 +207,8 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 6d465771745fa4832e5d95662e9f58f7ea4579eb
https://github.com/scummvm/scummvm/commit/6d465771745fa4832e5d95662e9f58f7ea4579eb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TSAGE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/tsage/detection.cpp
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index f85d843..7784a3d 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -117,7 +117,6 @@ public:
pattern += ".###";
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end());
TsAGE::tSageSavegameHeader header;
SaveStateList saveList;
@@ -141,6 +140,8 @@ public:
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 0aea4b59df9fadf8d4a91f982c7b38f47d8cd6e2
https://github.com/scummvm/scummvm/commit/0aea4b59df9fadf8d4a91f982c7b38f47d8cd6e2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
TUCKER: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/tucker/detection.cpp
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp
index 3d7859e..a2878f4 100644
--- a/engines/tucker/detection.cpp
+++ b/engines/tucker/detection.cpp
@@ -182,6 +182,8 @@ public:
saveList.push_back(SaveStateDescriptor(slot, description));
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 9eed3e15fbb34ab7bb2b4dc905decebddc43e5fd
https://github.com/scummvm/scummvm/commit/9eed3e15fbb34ab7bb2b4dc905decebddc43e5fd
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
VOYEUR: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/voyeur/detection.cpp
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 80a23d3..9e5320a 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -117,7 +117,6 @@ SaveStateList VoyeurMetaEngine::listSaves(const char *target) const {
Common::String pattern = Common::String::format("%s.0##", target);
filenames = saveFileMan->listSavefiles(pattern);
- sort(filenames.begin(), filenames.end()); // Sort to get the files in numerical order
SaveStateList saveList;
Voyeur::VoyeurSavegameHeader header;
@@ -139,6 +138,8 @@ SaveStateList VoyeurMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: 2b53a26bb4f609261c0a45a23c7fc65be6063afe
https://github.com/scummvm/scummvm/commit/2b53a26bb4f609261c0a45a23c7fc65be6063afe
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
WAGE: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/wage/detection.cpp
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index c4c1d35..91e20f3 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -100,7 +100,6 @@ SaveStateList WageMetaEngine::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 file = filenames.begin(); file != filenames.end(); ++file) {
@@ -119,6 +118,8 @@ SaveStateList WageMetaEngine::listSaves(const char *target) const {
}
}
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: d38a22011e53570629620166653978d32e35f5e8
https://github.com/scummvm/scummvm/commit/d38a22011e53570629620166653978d32e35f5e8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
ZVISION: Let listSaves return list sorted on slot numbers.
Changed paths:
engines/zvision/detection.cpp
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 5fdf17c..27ccbeb 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -132,7 +132,6 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
- Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)*/
SaveStateList saveList;
// We only use readSaveGameHeader() here, which doesn't need an engine callback
@@ -155,6 +154,8 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
delete zvisionSaveMan;
+ // Sort saves based on slot number.
+ Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
Commit: d7bb90ba84615f9e261118abb13d88b316cb92d7
https://github.com/scummvm/scummvm/commit/d7bb90ba84615f9e261118abb13d88b316cb92d7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-25T21:39:45+01:00
Commit Message:
ENGINES: Document sorting guaranty for MetaEngine::listSaves.
Changed paths:
engines/metaengine.h
diff --git a/engines/metaengine.h b/engines/metaengine.h
index 41f3ec4..3f8f56c 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -96,6 +96,9 @@ public:
/**
* Return a list of all save states associated with the given target.
*
+ * The list return is guarnateed to be sorted by slot numbers. That means
+ * lower slot numbers are always stored before bigger slot numbers.
+ *
* The caller has to ensure that this (Meta)Engine is responsible
* for the specified target (by using findGame on it respectively
* on the associated gameid from the relevant ConfMan entry, if present).
More information about the Scummvm-git-logs
mailing list