[Scummvm-git-logs] scummvm master -> f074eb1533f3d2ecba7adb9350b8d807cc06220a
lephilousophe
lephilousophe at users.noreply.github.com
Sat May 22 11:50:19 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
42e45f6769 NANCY: Move debug channels in detection.h to avoid pulling whole nancy.h
ec7c5bec6d ASYLUM: Use smaller include
799bf8aafa AGS: Move debug channels to detection
f074eb1533 AGS: Fix format string warning
Commit: 42e45f6769364679c676683eca6dfb87e6d705c8
https://github.com/scummvm/scummvm/commit/42e45f6769364679c676683eca6dfb87e6d705c8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-05-22T13:42:55+02:00
Commit Message:
NANCY: Move debug channels in detection.h to avoid pulling whole nancy.h
This one includes C++11 constructs which are not accepted by older
compilers
Changed paths:
engines/nancy/detection.cpp
engines/nancy/detection.h
engines/nancy/nancy.h
diff --git a/engines/nancy/detection.cpp b/engines/nancy/detection.cpp
index 1ae095c280..091071967d 100644
--- a/engines/nancy/detection.cpp
+++ b/engines/nancy/detection.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "engines/nancy/detection.h"
-#include "engines/nancy/nancy.h"
//#include "engines/nancy/dialogs.h"
const char *const directoryGlobs[] = {
diff --git a/engines/nancy/detection.h b/engines/nancy/detection.h
index b216c38e81..a2ae0fabb0 100644
--- a/engines/nancy/detection.h
+++ b/engines/nancy/detection.h
@@ -44,6 +44,12 @@ struct NancyGameDescription {
GameType gameType;
};
+enum NancyDebugChannels {
+ kDebugEngine = 1 << 0,
+ kDebugActionRecord = 1 << 1,
+ kDebugScene = 1 << 2
+};
+
} // End of namespace Nancy
#endif // NANCY_DETECTION_H
diff --git a/engines/nancy/nancy.h b/engines/nancy/nancy.h
index e7c9da002b..3edc956fd9 100644
--- a/engines/nancy/nancy.h
+++ b/engines/nancy/nancy.h
@@ -55,12 +55,6 @@ namespace Nancy {
static const int kSavegameVersion = 1;
-enum NancyDebugChannels {
- kDebugEngine = 1 << 0,
- kDebugActionRecord = 1 << 1,
- kDebugScene = 1 << 2
-};
-
struct NancyGameDescription;
class ResourceManager;
Commit: ec7c5bec6db4a4880c7529b70afc3ec2b16fb8db
https://github.com/scummvm/scummvm/commit/ec7c5bec6db4a4880c7529b70afc3ec2b16fb8db
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-05-22T13:44:19+02:00
Commit Message:
ASYLUM: Use smaller include
Whole asylum.h is not needed and contains C++11 constructs. Detection
fails to build with older compilers in this case.
Changed paths:
engines/asylum/detection.cpp
diff --git a/engines/asylum/detection.cpp b/engines/asylum/detection.cpp
index ff3e28e186..2c3756e1b1 100644
--- a/engines/asylum/detection.cpp
+++ b/engines/asylum/detection.cpp
@@ -24,7 +24,7 @@
#include "base/plugins.h"
#include "asylum/detection_table.h"
-#include "asylum/asylum.h"
+#include "asylum/console.h"
static const DebugChannelDef debugFlagList[] = {
{Asylum::kDebugLevelMain, "Main", "Generic debug level"},
Commit: 799bf8aafa6d20992fab85be36cf2b16a32435ee
https://github.com/scummvm/scummvm/commit/799bf8aafa6d20992fab85be36cf2b16a32435ee
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-05-22T13:45:21+02:00
Commit Message:
AGS: Move debug channels to detection
This fixes build with older compiler which don't support C++11 when
building detection code.
Changed paths:
engines/ags/ags.h
engines/ags/detection.cpp
engines/ags/detection.h
diff --git a/engines/ags/ags.h b/engines/ags/ags.h
index b8b0e97e83..751dfebe3e 100644
--- a/engines/ags/ags.h
+++ b/engines/ags/ags.h
@@ -33,6 +33,7 @@
#include "engines/savestate.h"
#include "graphics/surface.h"
+#include "ags/detection.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/lib/allegro/system.h"
#include "ags/engine/util/mutex_std.h"
@@ -51,14 +52,6 @@ namespace AGS {
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 200
-enum AGSDebugChannels {
- kDebugGraphics = 1 << 0,
- kDebugPath = 1 << 1,
- kDebugScan = 1 << 2,
- kDebugFilePath = 1 << 3,
- kDebugScript = 1 << 4
-};
-
struct AGSGameDescription;
struct PluginVersion;
class EventsManager;
diff --git a/engines/ags/detection.cpp b/engines/ags/detection.cpp
index 22c2139b92..3a2a4e432a 100644
--- a/engines/ags/detection.cpp
+++ b/engines/ags/detection.cpp
@@ -164,6 +164,15 @@ bool AGSOptionsWidget::save() {
} // namespace AGS3
+const DebugChannelDef AGSMetaEngineDetection::debugFlagList[] = {
+ {AGS::kDebugGraphics, "Graphics", "Graphics debug level"},
+ {AGS::kDebugPath, "Path", "Pathfinding debug level"},
+ {AGS::kDebugFilePath, "FilePath", "File path debug level"},
+ {AGS::kDebugScan, "Scan", "Scan for unrecognised games"},
+ {AGS::kDebugScript, "Script", "Enable debug script dump"},
+ DEBUG_CHANNEL_END
+};
+
AGSMetaEngineDetection::AGSMetaEngineDetection() : AdvancedMetaEngineDetection(AGS::GAME_DESCRIPTIONS,
sizeof(AGS::AGSGameDescription), AGS::GAME_NAMES) {
}
diff --git a/engines/ags/detection.h b/engines/ags/detection.h
index 5e1cf85de2..95eb401259 100644
--- a/engines/ags/detection.h
+++ b/engines/ags/detection.h
@@ -24,19 +24,17 @@
#define AGS_DETECTION_H
#include "engines/advancedDetector.h"
-#include "ags/ags.h"
-
-static const DebugChannelDef debugFlagList[] = {
- {AGS::kDebugGraphics, "Graphics", "Graphics debug level"},
- {AGS::kDebugPath, "Path", "Pathfinding debug level"},
- {AGS::kDebugFilePath, "FilePath", "File path debug level"},
- {AGS::kDebugScan, "Scan", "Scan for unrecognised games"},
- {AGS::kDebugScript, "Script", "Enable debug script dump"},
- DEBUG_CHANNEL_END
-};
namespace AGS {
+enum AGSDebugChannels {
+ kDebugGraphics = 1 << 0,
+ kDebugPath = 1 << 1,
+ kDebugScan = 1 << 2,
+ kDebugFilePath = 1 << 3,
+ kDebugScript = 1 << 4
+};
+
struct PluginVersion {
const char *_plugin;
int _version;
@@ -63,6 +61,8 @@ class AGSMetaEngineDetection : public AdvancedMetaEngineDetection {
mutable Common::String _filename;
mutable Common::String _md5;
+ static const DebugChannelDef debugFlagList[];
+
public:
AGSMetaEngineDetection();
~AGSMetaEngineDetection() override {}
Commit: f074eb1533f3d2ecba7adb9350b8d807cc06220a
https://github.com/scummvm/scummvm/commit/f074eb1533f3d2ecba7adb9350b8d807cc06220a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-05-22T13:48:53+02:00
Commit Message:
AGS: Fix format string warning
Make use of %s guarantees that error message won't get expanded one more
time
Changed paths:
engines/ags/shared/ac/common.cpp
diff --git a/engines/ags/shared/ac/common.cpp b/engines/ags/shared/ac/common.cpp
index e7be3e80bf..5ed1bbec4a 100644
--- a/engines/ags/shared/ac/common.cpp
+++ b/engines/ags/shared/ac/common.cpp
@@ -38,7 +38,7 @@ void quitprintf(const char *fmt, ...) {
// WORKAROUND: In ScummVM we have to make this an error, because
// too many places calling it presume it doesn't return,
// and will throw a wobbly if does
- error(text);
+ error("%s", (const char *)text);
}
} // namespace AGS3
More information about the Scummvm-git-logs
mailing list