[Scummvm-cvs-logs] scummvm master -> 224a634d7e245510e70e896fb6e2eb64551db507
lordhoto
lordhoto at gmail.com
Tue Jan 26 16:39:15 CET 2016
This automated email contains information about 37 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
06641f29a7 COMMON: Allow '#' to only match digits in matchString.
c022194275 ACCESS: Only request actual save slots in listSaves.
dcc811be20 AGI: Only request actual save slots in listSaves.
37ec3978d6 AGOS: Only request actual save slots in listSaves.
8b2fd644c1 AVALANCHE: Only request actual save slots in listSaves.
74a1587780 BBVS: Only request actual save slots in listSaves.
24daecd8f3 CGE: Only request actual save slots in listSaves.
1e64b4dd53 CGE2: Only request actual save slots in listSaves.
507bfe2a69 CINE: Only request actual save slots in listSaves.
6665f81c25 CRUISE: Only request actual save slots in listSaves.
d80e5e7f0c DRACI: Only request actual save slots in listSaves.
7a7c783fec DRASCULA: Only request actual save slots in listSaves.
6af2e8564a DREAMWEB: Only request actual save slots in listSaves.
8f77efae96 FULLPIPE: Only request actual save slots in listSaves.
e1a5cfaac6 HOPKINS: Only request actual save slots in listSaves.
0fa13039a2 HUGO: Only request actual save slots in listSaves.
4d7dda0b5c KYRA: Only request actual save slots in listSaves.
b2db9434de LAB: Only request actual save slots in listSaves.
351d8d5d38 LURE: Only request actual save slots in listSaves.
56a84cee0a MADS: Only request actual save slots in listSaves.
31f8405e6e NEVERHOOD: Only request actual save slots in listSaves.
fe943e04e3 PARALLACTION: Only request actual save slots in listSaves.
7bfd432223 QUEEN: Only request actual save slots in listSaves.
fee5944fe2 SAGA: Only request actual save slots in listSaves.
c15d2edecf SCI: Only request actual save slots in listSaves.
add6c998ab SCUMM: Only request actual save slots in listSaves.
0a670db018 SKY: Only request actual save slots in listSaves.
fda7ce1e14 SWORD1: Only request actual save slots in listSaves.
0260bfc63d SWORD2: Only request actual save slots in listSaves.
73286d94c1 TEENAGENT: Only request actual save slots in listSaves.
140d571f22 TINSEL: Only request actual save slots in listSaves.
7a34596c29 TOLTECS: Only request actual save slots in listSaves.
0285c5b628 TONY: Only request actual save slots in listSaves.
eaf590510b TOON: Only request actual save slots in listSaves.
a0750ab487 TSAGE: Only request actual save slots in listSaves.
6b7d0554a4 VOYEUR: Only request actual save slots in listSaves.
224a634d7e ZVISION: Only request actual save slots in listSaves.
Commit: 06641f29a7bdcda280b0291f215193f055c83969
https://github.com/scummvm/scummvm/commit/06641f29a7bdcda280b0291f215193f055c83969
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
COMMON: Allow '#' to only match digits in matchString.
Changed paths:
common/str.cpp
common/str.h
test/common/str.h
diff --git a/common/str.cpp b/common/str.cpp
index faf84d7..ae3a965 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -751,6 +751,13 @@ bool matchString(const char *str, const char *pat, bool ignoreCase, bool pathMod
return true;
break;
+ case '#':
+ if (!isDigit(*str))
+ return false;
+ pat++;
+ str++;
+ break;
+
default:
if ((!ignoreCase && *pat != *str) ||
(ignoreCase && tolower(*pat) != tolower(*str))) {
diff --git a/common/str.h b/common/str.h
index a30dae3..1b41c48 100644
--- a/common/str.h
+++ b/common/str.h
@@ -158,6 +158,7 @@ public:
* Token meaning:
* "*": any character, any amount of times.
* "?": any character, only once.
+ * "#": any decimal digit, only once.
*
* Example strings/patterns:
* String: monkey.s01 Pattern: monkey.s?? => true
@@ -165,6 +166,8 @@ public:
* String: monkey.s99 Pattern: monkey.s?1 => false
* String: monkey.s101 Pattern: monkey.s* => true
* String: monkey.s99 Pattern: monkey.s*1 => false
+ * String: monkey.s01 Pattern: monkey.s## => true
+ * String: monkey.s01 Pattern: monkey.### => false
*
* @param pat Glob pattern.
* @param ignoreCase Whether to ignore the case when doing pattern match
@@ -330,6 +333,7 @@ String normalizePath(const String &path, const char sep);
* Token meaning:
* "*": any character, any amount of times.
* "?": any character, only once.
+ * "#": any decimal digit, only once.
*
* Example strings/patterns:
* String: monkey.s01 Pattern: monkey.s?? => true
@@ -337,6 +341,8 @@ String normalizePath(const String &path, const char sep);
* String: monkey.s99 Pattern: monkey.s?1 => false
* String: monkey.s101 Pattern: monkey.s* => true
* String: monkey.s99 Pattern: monkey.s*1 => false
+ * String: monkey.s01 Pattern: monkey.s## => true
+ * String: monkey.s01 Pattern: monkey.### => false
*
* @param str Text to be matched against the given pattern.
* @param pat Glob pattern.
diff --git a/test/common/str.h b/test/common/str.h
index adc6a09..3ab5d82 100644
--- a/test/common/str.h
+++ b/test/common/str.h
@@ -332,6 +332,9 @@ class StringTestSuite : public CxxTest::TestSuite
TS_ASSERT(!Common::matchString("monkey.s99", "monkey.s*1"));
TS_ASSERT(Common::matchString("monkey.s101", "monkey.s*1"));
+ TS_ASSERT(Common::matchString("monkey.s01", "monkey.s##"));
+ TS_ASSERT(!Common::matchString("monkey.s01", "monkey.###"));
+
TS_ASSERT(!Common::String("").matchString("*_"));
TS_ASSERT(Common::String("a").matchString("a***"));
}
Commit: c022194275921c5aa0ca694cf0145704eda3cef5
https://github.com/scummvm/scummvm/commit/c022194275921c5aa0ca694cf0145704eda3cef5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
ACCESS: Only request actual save slots in listSaves.
Changed paths:
engines/access/detection.cpp
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 441740c..7494c9c 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -142,7 +142,7 @@ SaveStateList AccessMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = Common::String::format("%s.0??", target);
+ Common::String pattern = Common::String::format("%s.0##", target);
Access::AccessSavegameHeader header;
filenames = saveFileMan->listSavefiles(pattern);
Commit: dcc811be20c9404ce52ae46996eedb11432d1735
https://github.com/scummvm/scummvm/commit/dcc811be20c9404ce52ae46996eedb11432d1735
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
AGI: Only request actual save slots in listSaves.
Changed paths:
engines/agi/detection.cpp
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 823ec7b..971b562 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -259,7 +259,7 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
char saveDesc[31];
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 37ec3978d687ccadc55860ffc2e4b8641d671b51
https://github.com/scummvm/scummvm/commit/37ec3978d687ccadc55860ffc2e4b8641d671b51
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
AGOS: Only request actual save slots in listSaves.
Changed paths:
engines/agos/detection.cpp
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 72a38a3..9444615 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -183,7 +183,7 @@ SaveStateList AgosMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 8b2fd644c11347478838167b0cefb7a70af43a81
https://github.com/scummvm/scummvm/commit/8b2fd644c11347478838167b0cefb7a70af43a81
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
AVALANCHE: Only request actual save slots in listSaves.
Changed paths:
engines/avalanche/detection.cpp
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 028f167..484d148 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -107,7 +107,7 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
Common::String pattern = target;
pattern.toUppercase();
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 74a1587780f0324531b2bc57511a2bcded434764
https://github.com/scummvm/scummvm/commit/74a1587780f0324531b2bc57511a2bcded434764
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
BBVS: Only request actual save slots in listSaves.
Changed paths:
engines/bbvs/detection.cpp
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index d2e3ab8..eb894e9 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -113,7 +113,7 @@ SaveStateList BbvsMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Bbvs::BbvsEngine::SaveHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 24daecd8f3acb82ec6b0717da6eb2c27a7412bdd
https://github.com/scummvm/scummvm/commit/24daecd8f3acb82ec6b0717da6eb2c27a7412bdd
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
CGE: Only request actual save slots in listSaves.
Changed paths:
engines/cge/detection.cpp
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index da5eb2b..47c5f56 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -196,7 +196,7 @@ SaveStateList CGEMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 1e64b4dd53900da21bef55f90124fdb94b1441ef
https://github.com/scummvm/scummvm/commit/1e64b4dd53900da21bef55f90124fdb94b1441ef
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
CGE2: Only request actual save slots in listSaves.
Changed paths:
engines/cge2/detection.cpp
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index 4acdea3..a1867b0 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -196,7 +196,7 @@ SaveStateList CGE2MetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 507bfe2a699ec43427668cd7050cb187d6891324
https://github.com/scummvm/scummvm/commit/507bfe2a699ec43427668cd7050cb187d6891324
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
CINE: Only request actual save slots in listSaves.
Changed paths:
engines/cine/detection.cpp
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 40e79f9..dac7add 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -135,7 +135,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
Common::String pattern = target;
- pattern += ".?";
+ pattern += ".#";
Common::StringArray filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end());
Common::StringArray::const_iterator file;
@@ -156,10 +156,6 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
CommandeType saveDesc;
for (file = filenames.begin(); file != filenames.end(); ++file) {
- // Jump over savegame files that don't end with a digit (e.g. "fw.3" is ok, "fw.a" is not).
- if (!Common::isDigit(file->lastChar()))
- continue;
-
// Obtain the last digit of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 1);
Commit: 6665f81c2561cb285d6cf138afa963cff18277ae
https://github.com/scummvm/scummvm/commit/6665f81c2561cb285d6cf138afa963cff18277ae
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
CRUISE: Only request actual save slots in listSaves.
Changed paths:
engines/cruise/detection.cpp
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 4ca88a0..4d0ed2b 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -228,7 +228,7 @@ bool CruiseMetaEngine::hasFeature(MetaEngineFeature f) const {
SaveStateList CruiseMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
- Common::String pattern("cruise.s??");
+ Common::String pattern("cruise.s##");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: d80e5e7f0cb6aa5fce34ef90f8d63a7e77637a79
https://github.com/scummvm/scummvm/commit/d80e5e7f0cb6aa5fce34ef90f8d63a7e77637a79
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
DRACI: Only request actual save slots in listSaves.
Changed paths:
engines/draci/detection.cpp
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index c7cfe22..a32dae3 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -117,7 +117,7 @@ bool DraciMetaEngine::hasFeature(MetaEngineFeature f) const {
SaveStateList DraciMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
- Common::String pattern("draci.s??");
+ Common::String pattern("draci.s##");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 7a7c783fec16387556dd432cd7f32552595d80af
https://github.com/scummvm/scummvm/commit/7a7c783fec16387556dd432cd7f32552595d80af
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
DRASCULA: Only request actual save slots in listSaves.
Changed paths:
engines/drascula/detection.cpp
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index a84bd11..fbf58fa 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -352,7 +352,7 @@ SaveStateList DrasculaMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 6af2e8564ab1fb84e4b2957cb2c47ba3a73577bc
https://github.com/scummvm/scummvm/commit/6af2e8564ab1fb84e4b2957cb2c47ba3a73577bc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
DREAMWEB: Only request actual save slots in listSaves.
Changed paths:
engines/dreamweb/detection.cpp
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 01cfc7e..4fc624c 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -127,7 +127,7 @@ 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::StringArray files = saveFileMan->listSavefiles("DREAMWEB.D##");
Common::sort(files.begin(), files.end());
SaveStateList saveList;
Commit: 8f77efae960b69cddef85a3fc01ad25552357677
https://github.com/scummvm/scummvm/commit/8f77efae960b69cddef85a3fc01ad25552357677
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
FULLPIPE: Only request actual save slots in listSaves.
Changed paths:
engines/fullpipe/detection.cpp
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index de0ed04..ccd5593 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -108,7 +108,7 @@ bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
- Common::String pattern("fullpipe.s??");
+ Common::String pattern("fullpipe.s##");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: e1a5cfaac69b5c103f50ca7c634a92c770daf491
https://github.com/scummvm/scummvm/commit/e1a5cfaac69b5c103f50ca7c634a92c770daf491
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
HOPKINS: Only request actual save slots in listSaves.
Changed paths:
engines/hopkins/detection.cpp
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index a25b19e..670efb8 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -150,7 +150,7 @@ SaveStateList HopkinsMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = Common::String::format("%s.0??", target);
+ 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
Commit: 0fa13039a2f94ed299db19e7176bb151767bae83
https://github.com/scummvm/scummvm/commit/0fa13039a2f94ed299db19e7176bb151767bae83
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
HUGO: Only request actual save slots in listSaves.
Changed paths:
engines/hugo/detection.cpp
diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index 3907215..a005e64 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -177,7 +177,7 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += "-??.SAV";
+ pattern += "-##.SAV";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 4d7dda0b5cb9515d71c58393ff446534f7bb608b
https://github.com/scummvm/scummvm/commit/4d7dda0b5cb9515d71c58393ff446534f7bb608b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
KYRA: Only request actual save slots in listSaves.
Changed paths:
engines/kyra/detection.cpp
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 95c4acc..a4786ef 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -242,7 +242,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Kyra::KyraEngine_v1::SaveHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern);
@@ -250,10 +250,6 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
- // Skip automatic final saves made by EOB for the purpose of party transfer
- if (!scumm_stricmp(file->c_str() + file->size() - 3, "fin"))
- continue;
-
// Obtain the last 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);
Commit: b2db9434de27f9740c911421f5edd3554fbc7ef1
https://github.com/scummvm/scummvm/commit/b2db9434de27f9740c911421f5edd3554fbc7ef1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
LAB: Only request actual save slots in listSaves.
Changed paths:
engines/lab/detection.cpp
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index eedf09f..d01dff2 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -165,7 +165,7 @@ SaveStateList LabMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Lab::SaveGameHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
@@ -202,7 +202,7 @@ void LabMetaEngine::removeSaveState(const char *target, int slot) const {
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern.c_str());
Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 351d8d5d388c06cb937110270c4f6c6e11a456e1
https://github.com/scummvm/scummvm/commit/351d8d5d388c06cb937110270c4f6c6e11a456e1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
LURE: Only request actual save slots in listSaves.
Changed paths:
engines/lure/detection.cpp
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index eff699b..902e8af 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -242,7 +242,7 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = "lure.???";
+ Common::String pattern = "lure.###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 56a84cee0aa008c01981e061b9d9c3d2e0a6d4ab
https://github.com/scummvm/scummvm/commit/56a84cee0aa008c01981e061b9d9c3d2e0a6d4ab
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
MADS: Only request actual save slots in listSaves.
Changed paths:
engines/mads/detection.cpp
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 57f4776..0357bd4 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -188,7 +188,7 @@ SaveStateList MADSMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = Common::String::format("%s.0??", target);
+ Common::String pattern = Common::String::format("%s.0##", target);
MADS::MADSSavegameHeader header;
filenames = saveFileMan->listSavefiles(pattern);
Commit: 31f8405e6ee8a2ab04163d4933b6b598c3e5fb22
https://github.com/scummvm/scummvm/commit/31f8405e6ee8a2ab04163d4933b6b598c3e5fb22
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
NEVERHOOD: Only request actual save slots in listSaves.
Changed paths:
engines/neverhood/detection.cpp
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 5758039..4d545e1 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -241,7 +241,7 @@ SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Neverhood::NeverhoodEngine::SaveHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
Commit: fe943e04e3b56e6116fe7b7e0fc6aee243785790
https://github.com/scummvm/scummvm/commit/fe943e04e3b56e6116fe7b7e0fc6aee243785790
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
PARALLACTION: Only request actual save slots in listSaves.
Changed paths:
engines/parallaction/detection.cpp
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 277f1cb..daeee1f 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -271,7 +271,7 @@ bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, cons
SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
- Common::String pattern(ConfMan.getDomain(target)->getVal("gameid") + ".0??");
+ 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..)
Commit: 7bfd43222312c9384ec0badb164979b3d7431ec6
https://github.com/scummvm/scummvm/commit/7bfd43222312c9384ec0badb164979b3d7431ec6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
QUEEN: Only request actual save slots in listSaves.
Changed paths:
engines/queen/detection.cpp
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 5a7b4c6..96075a0 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -461,7 +461,7 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
char saveDesc[32];
- Common::String pattern("queen.s??");
+ Common::String pattern("queen.s##");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: fee5944fe2b98b9f627bab88da936db4b36a9635
https://github.com/scummvm/scummvm/commit/fee5944fe2b98b9f627bab88da936db4b36a9635
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SAGA: Only request actual save slots in listSaves.
Changed paths:
engines/saga/detection.cpp
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 8487811..13ca635 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -180,7 +180,7 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
char saveDesc[SAVE_TITLE_SIZE];
Common::String pattern = target;
- pattern += ".s??";
+ pattern += ".s##";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: c15d2edecff4f38d6abe5cfbd5257cb58b895954
https://github.com/scummvm/scummvm/commit/c15d2edecff4f38d6abe5cfbd5257cb58b895954
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SCI: Only request actual save slots in listSaves.
Changed paths:
engines/sci/detection.cpp
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 20894eb..7c70600 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -724,7 +724,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: add6c998ab92ceff0e56b554efd580f88ec29b26
https://github.com/scummvm/scummvm/commit/add6c998ab92ceff0e56b554efd580f88ec29b26
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SCUMM: Only request actual save slots in listSaves.
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 45647c9..e5bbad1 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1268,7 +1268,7 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = target;
- pattern += ".s??";
+ pattern += ".s##";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 0a670db0189e27a6ad7adc24f21c065a208309a7
https://github.com/scummvm/scummvm/commit/0a670db0189e27a6ad7adc24f21c065a208309a7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SKY: Only request actual save slots in listSaves.
Changed paths:
engines/sky/detection.cpp
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 4c7bb2d..8a89676 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -222,7 +222,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
// Find all saves
Common::StringArray filenames;
- filenames = saveFileMan->listSavefiles("SKY-VM.???");
+ 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.
@@ -235,13 +235,11 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
// Extract the extension
Common::String ext = file->c_str() + file->size() - 3;
ext.toUppercase();
- if (Common::isDigit(ext[0]) && Common::isDigit(ext[1]) && Common::isDigit(ext[2])) {
- int slotNum = atoi(ext.c_str());
- Common::InSaveFile *in = saveFileMan->openForLoading(*file);
- if (in) {
- saveList.push_back(SaveStateDescriptor(slotNum+1, savenames[slotNum]));
- delete in;
- }
+ int slotNum = atoi(ext.c_str());
+ Common::InSaveFile *in = saveFileMan->openForLoading(*file);
+ if (in) {
+ saveList.push_back(SaveStateDescriptor(slotNum+1, savenames[slotNum]));
+ delete in;
}
}
Commit: fda7ce1e14a3bfb96825b3879a7773f0e130b34b
https://github.com/scummvm/scummvm/commit/fda7ce1e14a3bfb96825b3879a7773f0e130b34b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SWORD1: Only request actual save slots in listSaves.
Changed paths:
engines/sword1/detection.cpp
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 8a1f3df..99c4bda 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -240,7 +240,7 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
char saveName[40];
- Common::StringArray filenames = saveFileMan->listSavefiles("sword1.???");
+ Common::StringArray filenames = saveFileMan->listSavefiles("sword1.###");
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
int slotNum = 0;
Commit: 0260bfc63d4b5291dd3112f0c52ad43f2bdd61d7
https://github.com/scummvm/scummvm/commit/0260bfc63d4b5291dd3112f0c52ad43f2bdd61d7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
SWORD2: Only request actual save slots in listSaves.
Changed paths:
engines/sword2/sword2.cpp
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 3375dda..baedecb 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -231,7 +231,7 @@ SaveStateList Sword2MetaEngine::listSaves(const char *target) const {
Common::StringArray filenames;
char saveDesc[SAVE_DESCRIPTION_LEN];
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 73286d94c15674d5197531d3a65e6e7f8d55ed86
https://github.com/scummvm/scummvm/commit/73286d94c15674d5197531d3a65e6e7f8d55ed86
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TEENAGENT: Only request actual save slots in listSaves.
Changed paths:
engines/teenagent/detection.cpp
diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
index 7a53faf..4fd3a06 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -125,7 +125,7 @@ public:
virtual SaveStateList listSaves(const char *target) const {
Common::String pattern = target;
- pattern += ".??";
+ pattern += ".##";
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
Common::sort(filenames.begin(), filenames.end());
Commit: 140d571f2297d7463323467573959c33ecaa11b2
https://github.com/scummvm/scummvm/commit/140d571f2297d7463323467573959c33ecaa11b2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TINSEL: Only request actual save slots in listSaves.
Changed paths:
engines/tinsel/detection.cpp
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index c7a62da..7cb2912 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -134,7 +134,7 @@ extern int getList(Common::SaveFileManager *saveFileMan, const Common::String &t
SaveStateList TinselMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
- pattern = pattern + ".???";
+ pattern = pattern + ".###";
Common::StringArray files = g_system->getSavefileManager()->listSavefiles(pattern);
sort(files.begin(), files.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 7a34596c2945dc5b9458fc1bc96e80f55c391427
https://github.com/scummvm/scummvm/commit/7a34596c2945dc5b9458fc1bc96e80f55c391427
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TOLTECS: Only request actual save slots in listSaves.
Changed paths:
engines/toltecs/detection.cpp
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index e8f08bc..fb7d812 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -262,7 +262,7 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Toltecs::ToltecsEngine::SaveHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
@@ -299,7 +299,7 @@ void ToltecsMetaEngine::removeSaveState(const char *target, int slot) const {
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern.c_str());
Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: 0285c5b628fa86c76c7e35dfbca4c07476939fdf
https://github.com/scummvm/scummvm/commit/0285c5b628fa86c76c7e35dfbca4c07476939fdf
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TONY: Only request actual save slots in listSaves.
Changed paths:
engines/tony/detection.cpp
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 9bb768d..2f05c0a 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -115,7 +115,7 @@ SaveStateList TonyMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = "tony.0??";
+ Common::String pattern = "tony.0##";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: eaf590510bda98ff517de1a9a6f1df4852f9a186
https://github.com/scummvm/scummvm/commit/eaf590510bda98ff517de1a9a6f1df4852f9a186
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TOON: Only request actual save slots in listSaves.
Changed paths:
engines/toon/detection.cpp
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 4f82514..e38ae3d 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -173,7 +173,7 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
Commit: a0750ab487d8fa45818c95061a0211b9debc350d
https://github.com/scummvm/scummvm/commit/a0750ab487d8fa45818c95061a0211b9debc350d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
TSAGE: Only request actual save slots in listSaves.
Changed paths:
engines/tsage/detection.cpp
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 3889679..f85d843 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -114,7 +114,7 @@ public:
virtual SaveStateList listSaves(const char *target) const {
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
sort(filenames.begin(), filenames.end());
Commit: 6b7d0554a415f43e4b25373223bdd8115f588982
https://github.com/scummvm/scummvm/commit/6b7d0554a415f43e4b25373223bdd8115f588982
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
VOYEUR: Only request actual save slots in listSaves.
Changed paths:
engines/voyeur/detection.cpp
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 3503eb1..80a23d3 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -114,7 +114,7 @@ SaveStateList VoyeurMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
- Common::String pattern = Common::String::format("%s.0??", target);
+ 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
Commit: 224a634d7e245510e70e896fb6e2eb64551db507
https://github.com/scummvm/scummvm/commit/224a634d7e245510e70e896fb6e2eb64551db507
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-26T16:35:30+01:00
Commit Message:
ZVISION: Only request actual save slots in listSaves.
Changed paths:
engines/zvision/detection.cpp
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 944d366..5fdf17c 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -128,7 +128,7 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
ZVision::SaveGameHeader header;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern.c_str());
@@ -170,7 +170,7 @@ void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
Common::StringArray filenames;
Common::String pattern = target;
- pattern += ".???";
+ pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern.c_str());
Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
More information about the Scummvm-git-logs
mailing list