[Scummvm-git-logs] scummvm master -> fa685f83ac5453f6349d23941c8c48a5e7befbdc
sev-
noreply at scummvm.org
Tue Nov 30 23:32:17 UTC 2021
This automated email contains information about 14 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0f3e1bfeb6 AD: Add full path entries' path components to globs
85e8f765c1 DIRECTOR: Switch detection to full paths and modify lzone-win for using it
45b59aa96e AD: Turn _matchFullPaths into kADFlagMatchFullPaths. Adapted Director and SCI
04d9b302f6 AGS: Fix warnings
3f90dbc7fa CINE: Fix clang warnings
fdcc1d3271 GROOVIE: Fix warning
48534d5e8c MADE: Added override keyword
208b2024d8 PRINCE: FIx clang warning
ac9b5de68c TWINE: Fix warning
94260b2f9f ILLUSIONS: BBDOU: Add missing coma
4eb5d6d6ca SWORD1: Fix clang warning
61e11fbbc1 ULTIMA: ULTIMA1: Fix clang warning
7672b8fded WINTERMUTE: Fix clang warning
fa685f83ac CLOUD: Fix overridden methods
Commit: 0f3e1bfeb6ca73d95afffef8544fe3adfa31d63e
https://github.com/scummvm/scummvm/commit/0f3e1bfeb6ca73d95afffef8544fe3adfa31d63e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-11-30T23:59:23+01:00
Commit Message:
AD: Add full path entries' path components to globs
This lets us avoid adding globs to the engines when they're
used only for detection.
Changed paths:
engines/advancedDetector.cpp
engines/advancedDetector.h
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 20bfd02cde..46e2199fb3 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -29,6 +29,7 @@
#include "common/punycode.h"
#include "common/system.h"
#include "common/textconsole.h"
+#include "common/tokenizer.h"
#include "common/translation.h"
#include "gui/EventRecorder.h"
#include "gui/gui-manager.h"
@@ -817,10 +818,30 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
_globsMap.setVal(*glob, true);
}
- // Check if the detection entries have only files from the blacklist
+ // Now scan all detection entries
for (const byte *descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameId != nullptr; descPtr += _descItemSize) {
const ADGameDescription *g = (const ADGameDescription *)descPtr;
+ // Scan for potential directory globs
+ for (const ADGameFileDescription *fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
+ if (strchr(fileDesc->fileName, '/')) {
+ if (!_matchFullPaths)
+ warning("Path component detected in entry for '%s' in engine '%s' but no _matchFullPaths is set",
+ g->gameId, getEngineId());
+
+ Common::StringTokenizer tok(fileDesc->fileName, "/");
+
+ while (!tok.empty()) {
+ Common::String component = tok.nextToken();
+
+ if (!tok.empty()) { // If it is not the last component
+ _globsMap.setVal(component, true);
+ }
+ }
+ }
+ }
+
+ // Check if the detection entry have only files from the blacklist
if (isEntryGrayListed(g)) {
debug(0, "WARNING: Detection entry for '%s' in engine '%s' contains only blacklisted names. Add more files to the entry (%s)",
g->gameId, getEngineId(), g->filesDescriptions[0].md5);
@@ -828,6 +849,27 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
}
}
+Common::StringArray AdvancedMetaEngineDetection::getPathsFromEntry(const ADGameDescription *g) {
+ Common::StringArray result;
+
+ for (const ADGameFileDescription *fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
+ if (!strchr(fileDesc->fileName, '/'))
+ continue;
+
+ Common::StringTokenizer tok(fileDesc->fileName, "/");
+
+ while (!tok.empty()) {
+ Common::String component = tok.nextToken();
+
+ if (!tok.empty()) { // If it is not the last component
+ result.push_back(component);
+ }
+ }
+ }
+
+ return result;
+}
+
bool AdvancedMetaEngineDetection::isEntryGrayListed(const ADGameDescription *g) const {
bool grayIsPresent = false, nonGrayIsPresent = false;
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index c9e560a947..3144eeb4de 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -383,6 +383,8 @@ public:
*/
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
+ static Common::StringArray getPathsFromEntry(const ADGameDescription *g);
+
protected:
/**
* A hashmap of files and their MD5 checksums.
Commit: 85e8f765c1f8e7044b6d3ec991eaa2c6e6ff0b3f
https://github.com/scummvm/scummvm/commit/85e8f765c1f8e7044b6d3ec991eaa2c6e6ff0b3f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-11-30T23:59:23+01:00
Commit Message:
DIRECTOR: Switch detection to full paths and modify lzone-win for using it
Changed paths:
engines/director/detection.cpp
engines/director/detection_paths.h
engines/director/detection_tables.h
engines/director/director.cpp
engines/director/metaengine.cpp
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index d4620f739d..2e8ecfac28 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -77,6 +77,7 @@ public:
DirectorMetaEngineDetection() : AdvancedMetaEngineDetection(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) {
_maxScanDepth = 5;
_directoryGlobs = Director::directoryGlobs;
+ _matchFullPaths = true;
// initialize customTarget hashmap here
for (int i = 0; customTargetList[i].name != nullptr; i++)
diff --git a/engines/director/detection_paths.h b/engines/director/detection_paths.h
index 9c9bfd4036..bf2db8a03c 100644
--- a/engines/director/detection_paths.h
+++ b/engines/director/detection_paths.h
@@ -27,7 +27,6 @@ namespace Director {
const char *directoryGlobs[] = {
"install",
- "l_zone",
"win_data", // L-ZONE
"data",
"gadget", // Gadget
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index c20c181882..0c7a0b3e8f 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1867,7 +1867,7 @@ static const DirectorGameDescription gameDescriptions[] = {
MACGAME1("lzone", "", "L-ZONE", "f5277c53bacd27936158dd3867e587e2", 392484, 300),
MACGAME1("lzone", "v2", "L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395088, 310),
GENGAME1_("lzone", "", "L-ZONE", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384968, Common::EN_ANY, Common::kPlatformMacintoshII, ADGF_MACRESFORK, 300),
- WINGAME1t("lzone", "", "L_ZONE.EXE", "079429bfc54a1df8e7b4d379aefa0b59", 370009, 300),
+ WINGAME1t("lzone", "", "L_ZONE/L_ZONE.EXE", "079429bfc54a1df8e7b4d379aefa0b59", 370009, 300),
#undef SUPPORT_STATUS
#define SUPPORT_STATUS ADGF_UNSTABLE
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 52e56c9290..47302dd155 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -253,7 +253,7 @@ Common::String DirectorEngine::getEXEName() const {
if (startMovie.startMovie.size() > 0)
return startMovie.startMovie;
- return Common::punycode_decodefilename(_gameDescription->desc.filesDescriptions[0].fileName);
+ return Common::punycode_decodefilename(Common::lastPathComponent(_gameDescription->desc.filesDescriptions[0].fileName, '/'));
}
void DirectorEngine::parseOptions() {
diff --git a/engines/director/metaengine.cpp b/engines/director/metaengine.cpp
index edc0cb9c7e..d2236c1bba 100644
--- a/engines/director/metaengine.cpp
+++ b/engines/director/metaengine.cpp
@@ -73,6 +73,12 @@ public:
};
Common::Error DirectorMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+ Common::StringArray dirs = AdvancedMetaEngineDetection::getPathsFromEntry(desc);
+ Common::FSNode gameDataDir = Common::FSNode(ConfMan.get("path"));
+
+ for (auto dir = dirs.begin(); dir != dirs.end(); ++dir)
+ SearchMan.addSubDirectoryMatching(gameDataDir, *dir);
+
*engine = new Director::DirectorEngine(syst, (const Director::DirectorGameDescription *)desc);
return Common::kNoError;
}
Commit: 45b59aa96edaac29c99788fc655ee5a85877ba49
https://github.com/scummvm/scummvm/commit/45b59aa96edaac29c99788fc655ee5a85877ba49
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-11-30T23:59:23+01:00
Commit Message:
AD: Turn _matchFullPaths into kADFlagMatchFullPaths. Adapted Director and SCI
Changed paths:
engines/advancedDetector.cpp
engines/advancedDetector.h
engines/director/detection.cpp
engines/sci/detection.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 46e2199fb3..12961b589e 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -466,7 +466,7 @@ void AdvancedMetaEngineDetection::composeFileHashMap(FileMap &allFiles, const Co
return;
for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
- Common::String tstr = (_matchFullPaths && !parentName.empty() ? parentName + "/" : "") + file->getName();
+ Common::String tstr = ((_flags & kADFlagMatchFullPaths) && !parentName.empty() ? parentName + "/" : "") + file->getName();
if (file->isDirectory()) {
if (!_globsMap.contains(file->getName()))
@@ -789,7 +789,6 @@ AdvancedMetaEngineDetection::AdvancedMetaEngineDetection(const void *descs, uint
_guiOptions = GUIO_NONE;
_maxScanDepth = 1;
_directoryGlobs = NULL;
- _matchFullPaths = false;
_maxAutogenLength = 15;
_hashMapsInited = false;
@@ -825,8 +824,8 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
// Scan for potential directory globs
for (const ADGameFileDescription *fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
if (strchr(fileDesc->fileName, '/')) {
- if (!_matchFullPaths)
- warning("Path component detected in entry for '%s' in engine '%s' but no _matchFullPaths is set",
+ if (!(_flags & kADFlagMatchFullPaths))
+ warning("Path component detected in entry for '%s' in engine '%s' but no kADFlagMatchFullPaths is set",
g->gameId, getEngineId());
Common::StringTokenizer tok(fileDesc->fileName, "/");
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 3144eeb4de..64b150c63b 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -226,7 +226,20 @@ enum ADFlags {
* In addition, this is useful if two variants of a game sharing the same
* gameid are contained in a single directory.
*/
- kADFlagUseExtraAsHint = (1 << 0)
+ kADFlagUseExtraAsHint = (1 << 0),
+
+ /**
+ * If set, filenames will be matched against the entire path, relative to
+ * the root detection directory.
+ *
+ * For example: "foo/bar.000" for a file at "<root>/foo/bar.000").
+ * Otherwise, filenames only match the base name (e.g. "bar.000" for the same file).
+ *
+ * @note @c _maxScanDepth must still be configured to allow
+ * the detector to find files inside subdirectories. @c _directoryGlobs are
+ * extracted from the entries.
+ */
+ kADFlagMatchFullPaths = (1 << 1)
};
@@ -317,18 +330,6 @@ protected:
*/
const char * const *_directoryGlobs;
- /**
- * If true, filenames will be matched against the entire path, relative to
- * the root detection directory.
- *
- * For example: "foo/bar.000" for a file at "<root>/foo/bar.000").
- * Otherwise, filenames only match the base name (e.g. "bar.000" for the same file).
- *
- * @note @c _maxScanDepth and @c _directoryGlobs must still be configured to allow
- * the detector to find files inside subdirectories.
- */
- bool _matchFullPaths;
-
/**
* If ADGF_AUTOGENTARGET is used, then this specifies the max length
* of the autogenerated name.
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 2e8ecfac28..0ddc22440c 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -77,7 +77,7 @@ public:
DirectorMetaEngineDetection() : AdvancedMetaEngineDetection(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) {
_maxScanDepth = 5;
_directoryGlobs = Director::directoryGlobs;
- _matchFullPaths = true;
+ _flags = kADFlagMatchFullPaths;
// initialize customTarget hashmap here
for (int i = 0; customTargetList[i].name != nullptr; i++)
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 1c45a3b350..a3aa1668d1 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -185,7 +185,7 @@ public:
SciMetaEngineDetection() : AdvancedMetaEngineDetection(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) {
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
- _matchFullPaths = true;
+ _flags = kADFlagMatchFullPaths;
}
const DebugChannelDef *getDebugChannels() const override {
Commit: 04d9b302f6e397b4a931a8c4fbf1a9863b291a4d
https://github.com/scummvm/scummvm/commit/04d9b302f6e397b4a931a8c4fbf1a9863b291a4d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:03:04+01:00
Commit Message:
AGS: Fix warnings
Changed paths:
engines/ags/engine/script/cc_instance.cpp
diff --git a/engines/ags/engine/script/cc_instance.cpp b/engines/ags/engine/script/cc_instance.cpp
index f7eb67ec24..ccfed5db2b 100644
--- a/engines/ags/engine/script/cc_instance.cpp
+++ b/engines/ags/engine/script/cc_instance.cpp
@@ -1290,7 +1290,7 @@ void ccInstance::DumpInstruction(const ScriptOperation &op) {
break;
case kScValData:
case kScValCodePtr:
- debugN(" %p", arg.GetPtrWithOffset());
+ debugN(" %p", (void *)arg.GetPtrWithOffset());
break;
case kScValStaticArray:
case kScValStaticObject:
@@ -1303,7 +1303,7 @@ void ccInstance::DumpInstruction(const ScriptOperation &op) {
if (!name.IsEmpty()) {
debugN(" &%s", name.GetCStr());
} else {
- debugN(" %p", arg.GetPtrWithOffset());
+ debugN(" %p", (void *)arg.GetPtrWithOffset());
}
}
break;
Commit: 3f90dbc7fac1d6f660a25ba3664b2ac6da0abf7f
https://github.com/scummvm/scummvm/commit/3f90dbc7fac1d6f660a25ba3664b2ac6da0abf7f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:05:33+01:00
Commit Message:
CINE: Fix clang warnings
Changed paths:
engines/cine/texte.cpp
diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp
index 6f3fb5490c..6e9c05c351 100644
--- a/engines/cine/texte.cpp
+++ b/engines/cine/texte.cpp
@@ -410,7 +410,7 @@ void initLanguage(Common::Language lang) {
"Could not create save file ...", //
"PAUSE",
"Sauvegarde de | %s",
- "Sauvegarde Annul\x82""e ...",
+ ("Sauvegarde Annul\x82""e ..."),
"Aucune sauvegarde dans le lecteur ...",
"Veuillez entrer le Nom de la Sauvegarde ."
};
@@ -515,7 +515,7 @@ void initLanguage(Common::Language lang) {
"Versuchen Sie, etwas anderes zu finden",
// OPERATE
"Es geht nicht",
- "Sagen wir, das war ein Versuch, und reden wir nicht mehr dr\x81""ber",
+ ("Sagen wir, das war ein Versuch, und reden wir nicht mehr dr\x81""ber"),
"Nichts passiert",
"Sie haben wirklich was Besseres zu tun",
// SPEAK
@@ -562,7 +562,7 @@ void initLanguage(Common::Language lang) {
};
static const CommandeType defaultActionCommand_DE[] = {
- "Pr\x81""fe", // FIXME? The third letter should be Latin Small Letter U with diaeresis
+ ("Pr\x81""fe"), // FIXME? The third letter should be Latin Small Letter U with diaeresis
"Nimm",
"Bestand",
"Benutze",
@@ -599,7 +599,7 @@ void initLanguage(Common::Language lang) {
"Diese Sicherungskopie gibt es nicht",
"Could not create save file ...", //
"PAUSE",
- "Er L\x84""dt | %s",
+ ("Er L\x84""dt | %s"),
"Ladevorgang Abgebrochen...",
"Kein Backup im Laufwerk...",
"Geben Sie den Namen|der Sicherungsdiskette ein"
Commit: fdcc1d32710086b37329fcc33606a9a70628b7b1
https://github.com/scummvm/scummvm/commit/fdcc1d32710086b37329fcc33606a9a70628b7b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:06:44+01:00
Commit Message:
GROOVIE: Fix warning
Changed paths:
engines/groovie/video/roq.h
diff --git a/engines/groovie/video/roq.h b/engines/groovie/video/roq.h
index 3bfd52fb1f..86d37f54c6 100644
--- a/engines/groovie/video/roq.h
+++ b/engines/groovie/video/roq.h
@@ -78,7 +78,7 @@ private:
// Origin
int16 _origX, _origY;
- int16 _screenOffset;
+ //int16 _screenOffset;
void calcStartStop(int &start, int &stop, int origin, int length);
// Block coding type
Commit: 48534d5e8c5f77c0d93e0b431a38ad2f9676d0f8
https://github.com/scummvm/scummvm/commit/48534d5e8c5f77c0d93e0b431a38ad2f9676d0f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:07:46+01:00
Commit Message:
MADE: Added override keyword
Changed paths:
engines/made/made.h
diff --git a/engines/made/made.h b/engines/made/made.h
index 3d153fa5da..6ba061316e 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -109,7 +109,7 @@ public:
void handleEvents();
protected:
- void pauseEngineIntern(bool pause);
+ void pauseEngineIntern(bool pause) override;
};
} // End of namespace Made
Commit: 208b2024d8375407a4b9fc6d3e01b3cf782b4bed
https://github.com/scummvm/scummvm/commit/208b2024d8375407a4b9fc6d3e01b3cf782b4bed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:08:52+01:00
Commit Message:
PRINCE: FIx clang warning
Changed paths:
engines/prince/option_text.h
diff --git a/engines/prince/option_text.h b/engines/prince/option_text.h
index 5739f4cde9..89a00d4354 100644
--- a/engines/prince/option_text.h
+++ b/engines/prince/option_text.h
@@ -49,7 +49,7 @@ char invOptionsTextDE[5][17] = {
"Anschauen",
"Benutzen",
"\x84""ffnen/Sto\x7f""en",
- "Schlie\x7f""en/Ziehen",
+ ("Schlie\x7f""en/Ziehen"),
"Geben"
};
@@ -59,7 +59,7 @@ const char optionsTextDE[7][17] = {
"Wegnehmen",
"Benutzen",
"\x84""ffnen/Sto\x7f""en",
- "Schlie\x7f""en/Ziehen",
+ ("Schlie\x7f""en/Ziehen"),
"Ansprechen"
};
Commit: ac9b5de68c1e4aa07597bed63e4ee79711b75465
https://github.com/scummvm/scummvm/commit/ac9b5de68c1e4aa07597bed63e4ee79711b75465
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:10:01+01:00
Commit Message:
TWINE: Fix warning
Changed paths:
engines/twine/holomap.h
diff --git a/engines/twine/holomap.h b/engines/twine/holomap.h
index 972146e348..c7fd7b5c31 100644
--- a/engines/twine/holomap.h
+++ b/engines/twine/holomap.h
@@ -76,7 +76,7 @@ private:
};
HolomapProjectedPos _projectedSurfacePositions[561];
int _projectedSurfaceIndex = 0;
- float _distanceModifier = 1.0f;
+ //float _distanceModifier = 1.0f;
int32 _numLocations = 0;
Location _locations[NUM_LOCATIONS];
Commit: 94260b2f9f620ee2e0edeee94fbac7771d96e313
https://github.com/scummvm/scummvm/commit/94260b2f9f620ee2e0edeee94fbac7771d96e313
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:16:33+01:00
Commit Message:
ILLUSIONS: BBDOU: Add missing coma
Changed paths:
engines/illusions/bbdou/bbdou_credits_staticdata.cpp
diff --git a/engines/illusions/bbdou/bbdou_credits_staticdata.cpp b/engines/illusions/bbdou/bbdou_credits_staticdata.cpp
index a00a86816e..dfa4454e5e 100644
--- a/engines/illusions/bbdou/bbdou_credits_staticdata.cpp
+++ b/engines/illusions/bbdou/bbdou_credits_staticdata.cpp
@@ -216,7 +216,7 @@ const char *kCreditsText[] = {
"Robert J. Ricci",
"Senior Communications Manager",
"Alan Lewis",
- "Director, Product Development Services"
+ "Director, Product Development Services",
"Mary Steer",
"Director, Creative Services",
"Leslie Mills",
Commit: 4eb5d6d6ca3d3aaa5561607549b67dfa3af3c882
https://github.com/scummvm/scummvm/commit/4eb5d6d6ca3d3aaa5561607549b67dfa3af3c882
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:19:34+01:00
Commit Message:
SWORD1: Fix clang warning
Changed paths:
engines/sword1/control.cpp
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 19772190d0..f9c57af29e 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -1510,7 +1510,7 @@ const uint8 Control::_languageStrings[8 * 20][43] = {
//BS1_GERMAN:
"PAUSE",
"BITTE LEGEN SIE CD-",
- "EIN UND DR\xDC""CKEN SIE EINE BELIEBIGE TASTE",
+ ("EIN UND DR\xDC""CKEN SIE EINE BELIEBIGE TASTE"),
"FALSCHE CD",
"Speichern",
"Laden",
Commit: 61e11fbbc1e862b896d9fbc46e67e1dc0dad3689
https://github.com/scummvm/scummvm/commit/61e11fbbc1e862b896d9fbc46e67e1dc0dad3689
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:22:52+01:00
Commit Message:
ULTIMA: ULTIMA1: Fix clang warning
Changed paths:
engines/ultima/ultima1/core/resources.cpp
diff --git a/engines/ultima/ultima1/core/resources.cpp b/engines/ultima/ultima1/core/resources.cpp
index 0e1c4668a0..525266a667 100644
--- a/engines/ultima/ultima1/core/resources.cpp
+++ b/engines/ultima/ultima1/core/resources.cpp
@@ -65,8 +65,8 @@ static const char *const SRC_CHAR_GEN_TEXT[14] = {
"b) %s\n"
"c) %s\n"
"d) %s",
- "a) %s\n"
- "b) %s",
+ ("a) %s\n"
+ "b) %s"),
"Select thy race:",
"Select thy sex:",
"Select thy class:",
Commit: 7672b8fded1b8a783af0653d899114c572d5c416
https://github.com/scummvm/scummvm/commit/7672b8fded1b8a783af0653d899114c572d5c416
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:23:54+01:00
Commit Message:
WINTERMUTE: Fix clang warning
Changed paths:
engines/wintermute/base/file/base_disk_file.cpp
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index df5096e2fb..0d536afc07 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -132,7 +132,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
"c:/users/mathieu/desktop/wintermute engine development kit/jeu verve/vervegame/data/", // Machu Mayu refers to "c:\users\mathieu\desktop\wintermute engine development kit\jeu verve\vervegame\data\interface\system\cr<0xE9>dits.script"
"c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf"
"c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
- "d:/engine/\322\303" "2/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
+ ("d:/engine/\322\303" "2/tg_ie_080128_1005/data/"), // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
"e:/users/jonathan/onedrive/knossos/data/", // K'NOSSOS refers to "e:\users\jonathan\onedrive\knossos\data\entities\helprobot\helprobot.script"
"f:/dokument/spel 5/demo/data/", // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
"f:/quest!!!/engine/quest/data/" // Book of Gron Part One refers to several files named "f:\quest!!!\engine\quest\data\entities\dver\*"
Commit: fa685f83ac5453f6349d23941c8c48a5e7befbdc
https://github.com/scummvm/scummvm/commit/fa685f83ac5453f6349d23941c8c48a5e7befbdc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-01T00:30:47+01:00
Commit Message:
CLOUD: Fix overridden methods
Changed paths:
backends/cloud/box/boxtokenrefresher.cpp
backends/cloud/box/boxtokenrefresher.h
backends/cloud/dropbox/dropboxtokenrefresher.cpp
backends/cloud/dropbox/dropboxtokenrefresher.h
backends/cloud/onedrive/onedrivetokenrefresher.cpp
backends/cloud/onedrive/onedrivetokenrefresher.h
diff --git a/backends/cloud/box/boxtokenrefresher.cpp b/backends/cloud/box/boxtokenrefresher.cpp
index fb84993ef2..fbe9557a6a 100644
--- a/backends/cloud/box/boxtokenrefresher.cpp
+++ b/backends/cloud/box/boxtokenrefresher.cpp
@@ -108,7 +108,7 @@ void BoxTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
-void BoxTokenRefresher::finishError(Networking::ErrorResponse error) {
+void BoxTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
if (error.httpResponseCode == 401) { // invalid_token
pause();
_parentStorage->refreshAccessToken(new Common::Callback<BoxTokenRefresher, Storage::BoolResponse>(this, &BoxTokenRefresher::tokenRefreshed));
diff --git a/backends/cloud/box/boxtokenrefresher.h b/backends/cloud/box/boxtokenrefresher.h
index 2111904a5c..88a1449d4f 100644
--- a/backends/cloud/box/boxtokenrefresher.h
+++ b/backends/cloud/box/boxtokenrefresher.h
@@ -38,7 +38,7 @@ class BoxTokenRefresher: public Networking::CurlJsonRequest {
void tokenRefreshed(Storage::BoolResponse response);
virtual void finishJson(Common::JSONValue *json);
- virtual void finishError(Networking::ErrorResponse error);
+ virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
public:
BoxTokenRefresher(BoxStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~BoxTokenRefresher();
diff --git a/backends/cloud/dropbox/dropboxtokenrefresher.cpp b/backends/cloud/dropbox/dropboxtokenrefresher.cpp
index 436f9a9034..d161452ced 100644
--- a/backends/cloud/dropbox/dropboxtokenrefresher.cpp
+++ b/backends/cloud/dropbox/dropboxtokenrefresher.cpp
@@ -98,7 +98,7 @@ void DropboxTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
-void DropboxTokenRefresher::finishError(Networking::ErrorResponse error) {
+void DropboxTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
if (error.httpResponseCode == 401) {
pause();
_parentStorage->refreshAccessToken(new Common::Callback<DropboxTokenRefresher, Storage::BoolResponse>(this, &DropboxTokenRefresher::tokenRefreshed));
diff --git a/backends/cloud/dropbox/dropboxtokenrefresher.h b/backends/cloud/dropbox/dropboxtokenrefresher.h
index 30ca3da398..0caa72b71b 100644
--- a/backends/cloud/dropbox/dropboxtokenrefresher.h
+++ b/backends/cloud/dropbox/dropboxtokenrefresher.h
@@ -38,7 +38,7 @@ class DropboxTokenRefresher: public Networking::CurlJsonRequest {
void tokenRefreshed(Storage::BoolResponse response);
virtual void finishJson(Common::JSONValue *json);
- virtual void finishError(Networking::ErrorResponse error);
+ virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
public:
DropboxTokenRefresher(DropboxStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~DropboxTokenRefresher();
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.cpp b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
index a396747d65..d4b896c107 100644
--- a/backends/cloud/onedrive/onedrivetokenrefresher.cpp
+++ b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
@@ -115,7 +115,7 @@ void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
-void OneDriveTokenRefresher::finishError(Networking::ErrorResponse error) {
+void OneDriveTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
if (error.failed) {
Common::JSONValue *value = Common::JSON::parse(error.response.c_str());
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.h b/backends/cloud/onedrive/onedrivetokenrefresher.h
index b4473798cd..f1d832995b 100644
--- a/backends/cloud/onedrive/onedrivetokenrefresher.h
+++ b/backends/cloud/onedrive/onedrivetokenrefresher.h
@@ -38,7 +38,7 @@ class OneDriveTokenRefresher: public Networking::CurlJsonRequest {
void tokenRefreshed(Storage::BoolResponse response);
virtual void finishJson(Common::JSONValue *json);
- virtual void finishError(Networking::ErrorResponse error);
+ virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
public:
OneDriveTokenRefresher(OneDriveStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~OneDriveTokenRefresher();
More information about the Scummvm-git-logs
mailing list