[Scummvm-git-logs] scummvm master -> 949027a01e6f99989de77d5f9052ed9024067a2a
sev-
noreply at scummvm.org
Sat Feb 22 20:56:42 UTC 2025
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e721bd540b AD: Fix debugC() usage
337a1d0117 AGI: Fix debugC() usage
f6bb29d2fc STARTREK: Fix debugC() usage
756868215d ENGINES: Switch debug channel enums from bitfield to sequential order
949027a01e ENGINES: [l-w]: Turn debug enums from bitfield into plain enums
Commit: e721bd540b3181b4446687f3e03fccc59ab842d0
https://github.com/scummvm/scummvm/commit/e721bd540b3181b4446687f3e03fccc59ab842d0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-22T21:24:19+01:00
Commit Message:
AD: Fix debugC() usage
Changed paths:
engines/advancedDetector.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 4c6124e2cec..416516b94c4 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -869,7 +869,7 @@ ADDetectedGames AdvancedMetaEngineDetectionBase::detectGame(const Common::FSNode
}
}
- debugC(2, "Totally found %d matches", matched.size());
+ debugC(2, kDebugGlobalDetection, "Totally found %d matches", matched.size());
return matched;
}
Commit: 337a1d0117ab1acf74f367a2fa40f2b7bd8e1c55
https://github.com/scummvm/scummvm/commit/337a1d0117ab1acf74f367a2fa40f2b7bd8e1c55
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-22T21:24:22+01:00
Commit Message:
AGI: Fix debugC() usage
Changed paths:
engines/agi/loader_a2.cpp
engines/agi/loader_gal_a2.cpp
engines/agi/loader_v1.cpp
diff --git a/engines/agi/loader_a2.cpp b/engines/agi/loader_a2.cpp
index 3e52ffa198c..180ba771b6d 100644
--- a/engines/agi/loader_a2.cpp
+++ b/engines/agi/loader_a2.cpp
@@ -85,7 +85,7 @@ void AgiLoader_A2::init() {
// read image as disk one
diskCount = readDiskOne(*stream, volumeMap);
if (diskCount > 0) {
- debugC(3, "AgiLoader_A2: disk one found: %s", imageFile.baseName().c_str());
+ debugC(3, kDebugLevelResources, "AgiLoader_A2: disk one found: %s", imageFile.baseName().c_str());
_disks.resize(diskCount);
_disks[0] = stream;
break;
diff --git a/engines/agi/loader_gal_a2.cpp b/engines/agi/loader_gal_a2.cpp
index c3cd32362b3..fe11d3eca2d 100644
--- a/engines/agi/loader_gal_a2.cpp
+++ b/engines/agi/loader_gal_a2.cpp
@@ -79,7 +79,7 @@ void GalLoader_A2::init() {
// read image as disk one
if (readDiskOne(*stream, logicDir)) {
- debugC(3, "GalLoader_A2: disk one found: %s", imageFile.baseName().c_str());
+ debugC(3, kDebugLevelResources, "GalLoader_A2: disk one found: %s", imageFile.baseName().c_str());
_disks.resize(GAL_A2_DISK_COUNT);
_disks[0] = stream;
break;
diff --git a/engines/agi/loader_v1.cpp b/engines/agi/loader_v1.cpp
index 36e8be6c07f..3d860a2484d 100644
--- a/engines/agi/loader_v1.cpp
+++ b/engines/agi/loader_v1.cpp
@@ -75,7 +75,7 @@ void AgiLoader_v1::init() {
delete stream;
if (success) {
- debugC(3, "AgiLoader_v1: disk one found: %s", imageFile.baseName().c_str());
+ debugC(3, kDebugLevelResources, "AgiLoader_v1: disk one found: %s", imageFile.baseName().c_str());
_imageFiles.push_back(imageFile.baseName());
if (_vm->getVersion() < 0x2001) {
// the first disk contains volumes 0 and 1.
@@ -121,7 +121,7 @@ void AgiLoader_v1::init() {
delete stream;
if (magic == 0x1234 && volume == 2) {
- debugC(3, "AgiLoader_v1: disk two found: %s", imageFile.baseName().c_str());
+ debugC(3, kDebugLevelResources, "AgiLoader_v1: disk two found: %s", imageFile.baseName().c_str());
_imageFiles.push_back(imageFile.baseName());
_volumes.push_back(AgiDiskVolume(_imageFiles.size() - 1, 0));
break;
Commit: f6bb29d2fc13bf1f0b6c4c0dbffaa905fef0e786
https://github.com/scummvm/scummvm/commit/f6bb29d2fc13bf1f0b6c4c0dbffaa905fef0e786
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-22T21:39:25+01:00
Commit Message:
STARTREK: Fix debugC() usage
Changed paths:
engines/startrek/actors.cpp
diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index 803b01ab283..dda88bd7cf0 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -92,7 +92,7 @@ void StarTrekEngine::loadBanFile(const Common::String &name) {
}
bool StarTrekEngine::actorWalkToPosition(int actorIndex, const Common::String &animFile, int16 srcX, int16 srcY, int16 destX, int16 destY) {
- debugC(6, "Obj %d: walk from (%d,%d) to (%d,%d)", actorIndex, srcX, srcY, destX, destY);
+ debugC(6, kDebugGeneral, "Obj %d: walk from (%d,%d) to (%d,%d)", actorIndex, srcX, srcY, destX, destY);
Actor *actor = &_actorList[actorIndex];
Commit: 756868215d31f779bd39639471991be8bf470762
https://github.com/scummvm/scummvm/commit/756868215d31f779bd39639471991be8bf470762
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-22T21:42:28+01:00
Commit Message:
ENGINES: Switch debug channel enums from bitfield to sequential order
Changed paths:
engines/cge/cge.h
engines/cge2/cge2.h
engines/cine/cine.h
engines/cruise/cruise.h
engines/draci/draci.h
engines/freescape/freescape.h
engines/hypno/hypno.h
engines/lastexpress/debug.h
engines/lure/luredefs.h
engines/macventure/debug.h
engines/mohawk/riven.h
engines/mortevielle/mortevielle.h
engines/petka/petka.h
engines/private/private.h
engines/scumm/detection.h
engines/sludge/sludge.h
engines/testbed/testbed.h
engines/tinsel/tinsel.h
engines/tony/tony.h
engines/wintermute/wintermute.h
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index fd31fa9ccfa..d57c36cc25c 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -104,9 +104,9 @@ enum CGEAction {
// our engine debug channels
enum {
- kCGEDebugBitmap = 1 << 0,
- kCGEDebugFile = 1 << 1,
- kCGEDebugEngine = 1 << 2
+ kCGEDebugBitmap = 1,
+ kCGEDebugFile,
+ kCGEDebugEngine,
};
enum SnList {
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index faed22dd2dd..53a4d594bab 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -135,7 +135,7 @@ enum GamePhase { kPhaseInGame, kPhaseIntro, kPhaseOver };
// our engine debug channels
enum {
- kCGE2DebugOpcode = 1 << 0
+ kCGE2DebugOpcode = 1,
};
enum CallbackType {
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index d03dc29cd9a..7f1ec1f43f1 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -253,10 +253,10 @@ enum {
};
enum {
- kCineDebugScript = 1 << 0,
- kCineDebugPart = 1 << 1,
- kCineDebugSound = 1 << 2,
- kCineDebugCollision = 1 << 3
+ kCineDebugScript = 1,
+ kCineDebugPart,
+ kCineDebugSound,
+ kCineDebugCollision,
};
enum {
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index 16f519058ca..ae18dbe1b23 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -47,7 +47,7 @@ namespace Cruise {
#define MAX_LANGUAGE_STRINGS 25
-
+
enum CRUISEAction {
kActionNone,
@@ -161,8 +161,8 @@ enum {
};
enum {
- kCruiseDebugScript = 1 << 0,
- kCruiseDebugSound = 1 << 1
+ kCruiseDebugScript = 1,
+ kCruiseDebugSound,
};
enum {
diff --git a/engines/draci/draci.h b/engines/draci/draci.h
index a815ced8ed6..7c30328ef45 100644
--- a/engines/draci/draci.h
+++ b/engines/draci/draci.h
@@ -121,13 +121,13 @@ public:
};
enum {
- kDraciGeneralDebugLevel = 1 << 0,
- kDraciBytecodeDebugLevel = 1 << 1,
- kDraciArchiverDebugLevel = 1 << 2,
- kDraciLogicDebugLevel = 1 << 3,
- kDraciAnimationDebugLevel = 1 << 4,
- kDraciSoundDebugLevel = 1 << 5,
- kDraciWalkingDebugLevel = 1 << 6
+ kDraciGeneralDebugLevel = 1,
+ kDraciBytecodeDebugLevel,
+ kDraciArchiverDebugLevel,
+ kDraciLogicDebugLevel,
+ kDraciAnimationDebugLevel,
+ kDraciSoundDebugLevel,
+ kDraciWalkingDebugLevel,
};
} // End of namespace Draci
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index 0082aba3c62..e8e7d911435 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -105,11 +105,11 @@ typedef Common::Array<byte *> ColorMap;
typedef Common::HashMap<uint16, int32> StateVars;
enum {
- kFreescapeDebugMove = 1 << 0,
- kFreescapeDebugParser = 1 << 1,
- kFreescapeDebugCode = 1 << 2,
- kFreescapeDebugMedia = 1 << 4,
- kFreescapeDebugGroup = 1 << 5,
+ kFreescapeDebugMove = 1,
+ kFreescapeDebugParser,
+ kFreescapeDebugCode,
+ kFreescapeDebugMedia,
+ kFreescapeDebugGroup,
};
enum {
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index a227d0eaa03..85aadfc9f6c 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -46,10 +46,10 @@ namespace Hypno {
// debug channels
enum {
- kHypnoDebugMedia = 1 << 0,
- kHypnoDebugParser = 1 << 1,
- kHypnoDebugArcade = 1 << 2,
- kHypnoDebugScene = 1 << 3
+ kHypnoDebugMedia = 1,
+ kHypnoDebugParser,
+ kHypnoDebugArcade,
+ kHypnoDebugScene,
};
// Player positions
diff --git a/engines/lastexpress/debug.h b/engines/lastexpress/debug.h
index 18a3a1d58dd..a4908418d90 100644
--- a/engines/lastexpress/debug.h
+++ b/engines/lastexpress/debug.h
@@ -31,15 +31,15 @@
namespace LastExpress {
enum {
- kLastExpressDebugGraphics = 1 << 0,
- kLastExpressDebugResource = 1 << 1,
- kLastExpressDebugCursor = 1 << 2,
- kLastExpressDebugSound = 1 << 3,
- kLastExpressDebugSubtitle = 1 << 4,
- kLastExpressDebugSavegame = 1 << 5,
- kLastExpressDebugLogic = 1 << 6,
- kLastExpressDebugScenes = 1 << 7,
- kLastExpressDebugUnknown = 1 << 8
+ kLastExpressDebugGraphics = 1,
+ kLastExpressDebugResource,
+ kLastExpressDebugCursor,
+ kLastExpressDebugSound,
+ kLastExpressDebugSubtitle,
+ kLastExpressDebugSavegame,
+ kLastExpressDebugLogic,
+ kLastExpressDebugScenes,
+ kLastExpressDebugUnknown,
};
class LastExpressEngine;
diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h
index d70bc60aa9a..b5543ca7348 100644
--- a/engines/lure/luredefs.h
+++ b/engines/lure/luredefs.h
@@ -37,12 +37,12 @@ namespace Lure {
#define LURE_DEBUG 1
enum {
- kLureDebugScripts = 1 << 0,
- kLureDebugAnimations = 1 << 1,
- kLureDebugHotspots = 1 << 2,
- kLureDebugFights = 1 << 3,
- kLureDebugSounds = 1 << 4,
- kLureDebugStrings = 1 << 5
+ kLureDebugScripts = 1,
+ kLureDebugAnimations,
+ kLureDebugHotspots,
+ kLureDebugFights,
+ kLureDebugSounds,
+ kLureDebugStrings,
};
#define ERROR_BASIC 1
diff --git a/engines/macventure/debug.h b/engines/macventure/debug.h
index f653457e746..42a9ba9cfe2 100644
--- a/engines/macventure/debug.h
+++ b/engines/macventure/debug.h
@@ -24,13 +24,13 @@
namespace MacVenture {
enum MacVentureDebugChannel {
- kMVDebugMain = 1 << 0,
- kMVDebugGUI = 1 << 1,
- kMVDebugImage = 1 << 2,
- kMVDebugText = 1 << 3,
- kMVDebugScript = 1 << 4,
- kMVDebugSound = 1 << 5,
- kMVDebugContainer = 1 << 6
+ kMVDebugMain = 1,
+ kMVDebugGUI,
+ kMVDebugImage,
+ kMVDebugText,
+ kMVDebugScript,
+ kMVDebugSound,
+ kMVDebugContainer,
};
} // End namespace MacVenture
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index b6dc753fb55..09b066266c9 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -76,8 +76,8 @@ enum {
// Engine Debug Flags
enum {
- kRivenDebugScript = (1 << 0),
- kRivenDebugPatches = (1 << 1)
+ kRivenDebugScript = 1,
+ kRivenDebugPatches,
};
struct ZipMode {
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 75957067416..42d70339efe 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -49,9 +49,9 @@ namespace Mortevielle {
// Debug channels
enum {
- kMortevielleCore = 1 << 0,
- kMortevielleGraphics = 1 << 1,
- kMortevielleSounds = 1 << 2
+ kMortevielleCore = 1,
+ kMortevielleGraphics,
+ kMortevielleSounds,
};
// Game languages
diff --git a/engines/petka/petka.h b/engines/petka/petka.h
index 85f98bc4af4..89f61f3523b 100644
--- a/engines/petka/petka.h
+++ b/engines/petka/petka.h
@@ -70,10 +70,10 @@ class QSystem;
class VideoSystem;
enum {
- kPetkaDebugGeneral = 1 << 0,
- kPetkaDebugResources = 1 << 1,
- kPetkaDebugMessagingSystem = 1 << 2,
- kPetkaDebugDialogs = 1 << 3
+ kPetkaDebugGeneral = 1,
+ kPetkaDebugResources,
+ kPetkaDebugMessagingSystem,
+ kPetkaDebugDialogs,
};
enum {
diff --git a/engines/private/private.h b/engines/private/private.h
index b22bad4b765..b6230508d5e 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -45,9 +45,9 @@ namespace Private {
// debug channels
enum {
- kPrivateDebugFunction = 1 << 0,
- kPrivateDebugCode = 1 << 1,
- kPrivateDebugScript = 1 << 2
+ kPrivateDebugFunction = 1,
+ kPrivateDebugCode,
+ kPrivateDebugScript,
};
// sounds
diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h
index 6772039774f..ae5f5efabfa 100644
--- a/engines/scumm/detection.h
+++ b/engines/scumm/detection.h
@@ -267,18 +267,18 @@ struct RuScummPatcher {
};
enum {
- DEBUG_GENERAL = 1 << 0, // General debug
- DEBUG_SCRIPTS = 1 << 2, // Track script execution (start/stop/pause)
- DEBUG_OPCODES = 1 << 3, // Track opcode invocations
- DEBUG_VARS = 1 << 4, // Track variable changes
- DEBUG_RESOURCE = 1 << 5, // Track resource loading / allocation
- DEBUG_IMUSE = 1 << 6, // Track iMUSE events
- DEBUG_SOUND = 1 << 7, // General Sound Debug
- DEBUG_ACTORS = 1 << 8, // General Actor Debug
- DEBUG_INSANE = 1 << 9, // Track INSANE
- DEBUG_SMUSH = 1 << 10, // Track SMUSH
- DEBUG_MOONBASE_AI = 1 << 11, // Moonbase AI
- DEBUG_NETWORK = 1 << 12 // Track Networking
+ DEBUG_GENERAL = 1, // General debug
+ DEBUG_SCRIPTS, // Track script execution (start/stop/pause)
+ DEBUG_OPCODES, // Track opcode invocations
+ DEBUG_VARS, // Track variable changes
+ DEBUG_RESOURCE, // Track resource loading / allocation
+ DEBUG_IMUSE, // Track iMUSE events
+ DEBUG_SOUND, // General Sound Debug
+ DEBUG_ACTORS, // General Actor Debug
+ DEBUG_INSANE, // Track INSANE
+ DEBUG_SMUSH, // Track SMUSH
+ DEBUG_MOONBASE_AI, // Moonbase AI
+ DEBUG_NETWORK, // Track Networking
};
} // End of namespace Scumm
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index 27f3f103efe..5e06cad43a8 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -56,13 +56,13 @@ struct SludgeGameDescription;
// debug channels
enum {
- kSludgeDebugFatal = 1 << 0,
- kSludgeDebugDataLoad = 1 << 1,
- kSludgeDebugStackMachine = 1 << 2,
- kSludgeDebugBuiltin = 1 << 3,
- kSludgeDebugGraphics = 1 << 4,
- kSludgeDebugZBuffer = 1 << 5,
- kSludgeDebugSound = 1 << 6
+ kSludgeDebugFatal = 1,
+ kSludgeDebugDataLoad,
+ kSludgeDebugStackMachine,
+ kSludgeDebugBuiltin,
+ kSludgeDebugGraphics,
+ kSludgeDebugZBuffer,
+ kSludgeDebugSound,
};
class SludgeEngine: public Engine {
diff --git a/engines/testbed/testbed.h b/engines/testbed/testbed.h
index 1289b1e3acc..ee098791e1d 100644
--- a/engines/testbed/testbed.h
+++ b/engines/testbed/testbed.h
@@ -34,8 +34,9 @@ namespace Testbed {
class TestbedConfigManager;
enum {
- kTestbedLogOutput = 1 << 0,
- kTestbedEngineDebug = 1 << 2,
+ kTestbedLogOutput = 1,
+ kTestbedEngineDebug,
+
kCmdRerunTestbed = 'crtb'
};
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index d47a2d20b52..9665804d02d 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -94,10 +94,10 @@ enum TINSELAction {
};
enum {
- kTinselDebugAnimations = 1 << 0,
- kTinselDebugActions = 1 << 1,
- kTinselDebugSound = 1 << 2,
- kTinselDebugMusic = 2 << 3
+ kTinselDebugAnimations = 1,
+ kTinselDebugActions,
+ kTinselDebugSound,
+ kTinselDebugMusic,
};
// Just for development
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index 80ff8b38c79..bb44df48815 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -56,11 +56,11 @@ using namespace MPAL;
class Globals;
enum {
- kTonyDebugAnimations = 1 << 0,
- kTonyDebugActions = 1 << 1,
- kTonyDebugSound = 1 << 2,
- kTonyDebugMusic = 1 << 3,
- kTonyDebugMPAL = 1 << 4
+ kTonyDebugAnimations = 1,
+ kTonyDebugActions,
+ kTonyDebugSound,
+ kTonyDebugMusic,
+ kTonyDebugMPAL,
};
#define DEBUG_BASIC 1
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index 3134d0e99e3..a28a0ac54dd 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -40,12 +40,12 @@ const uint UINT_MAX_VALUE = 0xffffffff;
// our engine debug channels
enum {
- kWintermuteDebugLog = 1 << 0, // The debug-logs from the original engine
- kWintermuteDebugSaveGame = 1 << 1,
- kWintermuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4)
- kWintermuteDebugFileAccess = 1 << 3, // the current limitation is 32 debug channels (1 << 31 is the last one)
- kWintermuteDebugAudio = 1 << 4,
- kWintermuteDebugGeneral = 1 << 5
+ kWintermuteDebugLog = 1, // The debug-logs from the original engine
+ kWintermuteDebugSaveGame,
+ kWintermuteDebugFont, // next new channel must be 1 << 2 (4)
+ kWintermuteDebugFileAccess, // the current limitation is 32 debug channels (1 << 31 is the last one)
+ kWintermuteDebugAudio,
+ kWintermuteDebugGeneral,
};
class WintermuteEngine : public Engine {
Commit: 949027a01e6f99989de77d5f9052ed9024067a2a
https://github.com/scummvm/scummvm/commit/949027a01e6f99989de77d5f9052ed9024067a2a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-22T21:55:59+01:00
Commit Message:
ENGINES: [l-w]: Turn debug enums from bitfield into plain enums
Changed paths:
engines/lilliput/lilliput.h
engines/m4/detection.h
engines/mads/mads.h
engines/mm/mm.h
engines/mohawk/livingbooks.h
engines/mohawk/myst.h
engines/myst3/myst3.h
engines/nancy/detection.h
engines/ngi/ngi.h
engines/parallaction/parallaction.h
engines/pink/pink.h
engines/plumbers/plumbers.h
engines/saga2/saga2.h
engines/sci/sci.h
engines/sherlock/sherlock.h
engines/stark/debug.h
engines/startrek/startrek.h
engines/supernova/console.h
engines/supernova/detection.cpp
engines/sword25/sword25.h
engines/teenagent/teenagent.h
engines/tetraedge/detection.h
engines/titanic/debugger.h
engines/toon/toon.h
engines/touche/touche.h
engines/twine/shared.h
engines/ultima/ultima.h
engines/voyeur/voyeur.h
engines/watchmaker/detection.cpp
engines/watchmaker/watchmaker.h
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index b197c33a32f..e85ee044473 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -54,11 +54,11 @@ namespace Lilliput {
static const int kSavegameVersion = 1;
enum LilliputDebugChannels {
- kDebugEngine = 1 << 0,
- kDebugScript = 1 << 1,
- kDebugSound = 1 << 2,
- kDebugEngineTBC = 1 << 3,
- kDebugScriptTBC = 1 << 4
+ kDebugEngine = 1,
+ kDebugScript,
+ kDebugSound,
+ kDebugEngineTBC,
+ kDebugScriptTBC,
};
enum InterfaceHotspotStatus {
diff --git a/engines/m4/detection.h b/engines/m4/detection.h
index bf463be23f6..57bce443ab3 100644
--- a/engines/m4/detection.h
+++ b/engines/m4/detection.h
@@ -27,9 +27,9 @@
namespace M4 {
enum M4DebugChannels {
- kDebugScripts = 1 << 0,
- kDebugMessages = 1 << 1,
- kDebugCore = 1 << 2
+ kDebugScripts = 1,
+ kDebugMessages,
+ kDebugCore,
};
enum M4GameType {
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 70eee63fa74..1f923da9545 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -72,9 +72,9 @@ enum MADSActions {
};
enum MADSDebugChannels {
- kDebugPath = 1 << 0,
- kDebugScripts = 1 << 1,
- kDebugGraphics = 1 << 2
+ kDebugPath = 1,
+ kDebugScripts,
+ kDebugGraphics,
};
enum ScreenFade {
diff --git a/engines/mm/mm.h b/engines/mm/mm.h
index 526bcb4f59b..f71d18e3b79 100644
--- a/engines/mm/mm.h
+++ b/engines/mm/mm.h
@@ -28,10 +28,10 @@
namespace MM {
enum MightAndMagicDebugChannels {
- kDebugPath = 1 << 0,
- kDebugScripts = 1 << 1,
- kDebugGraphics = 1 << 2,
- kDebugSound = 1 << 3
+ kDebugPath = 1,
+ kDebugScripts,
+ kDebugGraphics,
+ kDebugSound,
};
class MMEngine : public Engine {
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 35c0c9cda6a..7374c7199fd 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -44,7 +44,7 @@ namespace Mohawk {
// Engine Debug Flags
enum {
- kDebugCode = (1 << 0)
+ kDebugCode = 1,
};
#define LBKEY_MOD_CTRL 1
diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h
index 79a98bff55f..33a91b43b96 100644
--- a/engines/mohawk/myst.h
+++ b/engines/mohawk/myst.h
@@ -51,16 +51,16 @@ class MystCard;
// Engine Debug Flags
enum {
- kDebugVariable = (1 << 0),
- kDebugSaveLoad = (1 << 1),
- kDebugView = (1 << 2),
- kDebugHint = (1 << 3),
- kDebugResource = (1 << 4),
- kDebugINIT = (1 << 5),
- kDebugEXIT = (1 << 6),
- kDebugScript = (1 << 7),
- kDebugHelp = (1 << 8),
- kDebugCache = (1 << 9)
+ kDebugVariable = 1,
+ kDebugSaveLoad,
+ kDebugView,
+ kDebugHint,
+ kDebugResource,
+ kDebugINIT,
+ kDebugEXIT,
+ kDebugScript,
+ kDebugHelp,
+ kDebugCache,
};
// Myst Stacks
diff --git a/engines/myst3/myst3.h b/engines/myst3/myst3.h
index 8cd0ecec72e..7ca4b904358 100644
--- a/engines/myst3/myst3.h
+++ b/engines/myst3/myst3.h
@@ -44,10 +44,10 @@ namespace Myst3 {
// Engine Debug Flags
enum {
- kDebugVariable = (1 << 0),
- kDebugSaveLoad = (1 << 1),
- kDebugNode = (1 << 2),
- kDebugScript = (1 << 3)
+ kDebugVariable = 1,
+ kDebugSaveLoad,
+ kDebugNode,
+ kDebugScript,
};
enum TransitionType {
diff --git a/engines/nancy/detection.h b/engines/nancy/detection.h
index 8e7815d97ab..4cc5e8d9706 100644
--- a/engines/nancy/detection.h
+++ b/engines/nancy/detection.h
@@ -54,12 +54,12 @@ struct NancyGameDescription {
};
enum NancyDebugChannels {
- kDebugEngine = 1 << 0,
- kDebugActionRecord = 1 << 1,
- kDebugScene = 1 << 2,
- kDebugSound = 1 << 3,
- kDebugVideo = 1 << 4,
- kDebugHypertext = 1 << 5
+ kDebugEngine = 1,
+ kDebugActionRecord,
+ kDebugScene,
+ kDebugSound,
+ kDebugVideo,
+ kDebugHypertext,
};
// Settings found in the original engine
diff --git a/engines/ngi/ngi.h b/engines/ngi/ngi.h
index 76edce6f5bd..0db2f996a3d 100644
--- a/engines/ngi/ngi.h
+++ b/engines/ngi/ngi.h
@@ -42,17 +42,17 @@ class SoundHandle;
namespace NGI {
enum {
- kDebugPathfinding = 1 << 0,
- kDebugDrawing = 1 << 1,
- kDebugLoading = 1 << 2,
- kDebugAnimation = 1 << 3,
- kDebugMemory = 1 << 4,
- kDebugEvents = 1 << 5,
- kDebugBehavior = 1 << 6,
- kDebugInventory = 1 << 7,
- kDebugSceneLogic = 1 << 8,
- kDebugInteractions = 1 << 9,
- kDebugXML = 1 << 10
+ kDebugPathfinding = 1,
+ kDebugDrawing,
+ kDebugLoading,
+ kDebugAnimation,
+ kDebugMemory,
+ kDebugEvents,
+ kDebugBehavior,
+ kDebugInventory,
+ kDebugSceneLogic,
+ kDebugInteractions,
+ kDebugXML,
};
#define MAXGAMEOBJH 10000
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 4e86559e90c..1cd620dae33 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -53,16 +53,16 @@
namespace Parallaction {
enum {
- kDebugDisk = 1 << 0,
- kDebugWalk = 1 << 1,
- kDebugParser = 1 << 2,
- kDebugDialogue = 1 << 3,
- kDebugGraphics = 1 << 4,
- kDebugExec = 1 << 5,
- kDebugInput = 1 << 6,
- kDebugAudio = 1 << 7,
- kDebugMenu = 1 << 8,
- kDebugInventory = 1 << 9
+ kDebugDisk = 1,
+ kDebugWalk,
+ kDebugParser,
+ kDebugDialogue,
+ kDebugGraphics,
+ kDebugExec,
+ kDebugInput,
+ kDebugAudio,
+ kDebugMenu,
+ kDebugInventory,
};
enum EngineFlags {
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index a53ab02b625..7e76cfad232 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -79,11 +79,11 @@ class Page;
class LeadActor;
enum {
- kPinkDebugGeneral = 1 << 0,
- kPinkDebugLoadingResources = 1 << 1,
- kPinkDebugLoadingObjects = 1 << 2,
- kPinkDebugScripts = 1 << 3,
- kPinkDebugActions = 1 << 4
+ kPinkDebugGeneral = 1,
+ kPinkDebugLoadingResources,
+ kPinkDebugLoadingObjects,
+ kPinkDebugScripts,
+ kPinkDebugActions,
};
enum {
diff --git a/engines/plumbers/plumbers.h b/engines/plumbers/plumbers.h
index a8c4fe8cd17..4c5aec79a08 100644
--- a/engines/plumbers/plumbers.h
+++ b/engines/plumbers/plumbers.h
@@ -46,7 +46,7 @@ namespace Plumbers {
class Console;
enum PlumbersDebugChannels {
- kDebugGeneral = 1 << 0
+ kDebugGeneral = 1,
};
static const int kMaxChoice = 3;
diff --git a/engines/saga2/saga2.h b/engines/saga2/saga2.h
index fdaf4278ca2..1147a7f6181 100644
--- a/engines/saga2/saga2.h
+++ b/engines/saga2/saga2.h
@@ -86,20 +86,20 @@ class TileModeManager;
struct SAGA2GameDescription;
enum {
- kDebugResources = 1 << 0,
- kDebugActors = 1 << 1,
- kDebugScripts = 1 << 2,
- kDebugEventLoop = 1 << 3,
- kDebugInit = 1 << 4,
- kDebugTiles = 1 << 5,
- kDebugPalettes = 1 << 6,
- kDebugLoading = 1 << 7,
- kDebugTimers = 1 << 8,
- kDebugPath = 1 << 9,
- kDebugTasks = 1 << 10,
- kDebugSound = 1 << 11,
- kDebugSaveload = 1 << 12,
- kDebugSensors = 1 << 13
+ kDebugResources = 1,
+ kDebugActors,
+ kDebugScripts,
+ kDebugEventLoop,
+ kDebugInit,
+ kDebugTiles,
+ kDebugPalettes,
+ kDebugLoading,
+ kDebugTimers,
+ kDebugPath,
+ kDebugTasks,
+ kDebugSound,
+ kDebugSaveload,
+ kDebugSensors,
};
#define TICKSPERSECOND (728L/10L)
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index d9668ebaa75..8cdf256862c 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -91,32 +91,32 @@ class GfxCursor32;
/** Engine debug levels */
enum kDebugLevels {
- kDebugLevelError = 1 << 0,
- kDebugLevelNodes = 1 << 1,
- kDebugLevelGraphics = 1 << 2,
- kDebugLevelStrings = 1 << 3,
- kDebugLevelMemory = 1 << 4,
- kDebugLevelFuncCheck = 1 << 5,
- kDebugLevelBresen = 1 << 6,
- kDebugLevelSound = 1 << 7,
- kDebugLevelBaseSetter = 1 << 8,
- kDebugLevelParser = 1 << 9,
- kDebugLevelSaid = 1 << 10,
- kDebugLevelFile = 1 << 11,
- kDebugLevelTime = 1 << 12,
- kDebugLevelRoom = 1 << 13,
- kDebugLevelAvoidPath = 1 << 14,
- kDebugLevelDclInflate = 1 << 15,
- kDebugLevelVM = 1 << 16,
- kDebugLevelScripts = 1 << 17,
- kDebugLevelGC = 1 << 18,
- kDebugLevelResMan = 1 << 19,
- kDebugLevelOnStartup = 1 << 20,
- kDebugLevelDebugMode = 1 << 21,
- kDebugLevelPatcher = 1 << 22,
- kDebugLevelWorkarounds = 1 << 23,
- kDebugLevelVideo = 1 << 24,
- kDebugLevelGame = 1 << 25
+ kDebugLevelError = 1,
+ kDebugLevelNodes,
+ kDebugLevelGraphics,
+ kDebugLevelStrings,
+ kDebugLevelMemory,
+ kDebugLevelFuncCheck,
+ kDebugLevelBresen,
+ kDebugLevelSound,
+ kDebugLevelBaseSetter,
+ kDebugLevelParser,
+ kDebugLevelSaid,
+ kDebugLevelFile,
+ kDebugLevelTime,
+ kDebugLevelRoom,
+ kDebugLevelAvoidPath,
+ kDebugLevelDclInflate,
+ kDebugLevelVM,
+ kDebugLevelScripts,
+ kDebugLevelGC,
+ kDebugLevelResMan,
+ kDebugLevelOnStartup,
+ kDebugLevelDebugMode,
+ kDebugLevelPatcher,
+ kDebugLevelWorkarounds,
+ kDebugLevelVideo,
+ kDebugLevelGame,
};
@@ -184,21 +184,21 @@ public:
const SciGameId &getGameId() const { return _gameId; }
const char *getGameIdStr() const;
Common::Language getLanguage() const;
-
+
/**
* Returns true if the game's language direction is Right To Left.
* RTL support did not exist in the original SCI engine.
* This is a ScummVM feature to support modern fan translations.
*/
bool isLanguageRTL() const;
-
+
/** Returns the original platform of the game. */
Common::Platform getPlatform() const;
bool isDemo() const;
bool isCD() const;
bool useHiresGraphics() const;
- /**
+ /**
* Returns true if the game's original platform is Macintosh or Amiga.
* Note that this is not necessarily the endianness of the game's resources.
*/
@@ -208,7 +208,7 @@ public:
/** Returns true if the game supports native Mac fonts and the fonts are available. */
bool hasMacFonts() const;
-
+
/** Returns true if the game is a Mac version with an icon bar on the bottom. */
bool hasMacIconBar() const;
@@ -365,7 +365,7 @@ private:
* or restoring a game re-initializes certain states and continues the loop.
*/
void runGame();
-
+
/**
* Initializes the stack to call a method in the game object once the VM starts.
* When starting a game or restarting via kRestartGame16, the play method is called.
@@ -401,7 +401,7 @@ private:
* we handle those with our own script patches just like any other script.
*/
bool gameHasFanMadePatch();
-
+
/**
* For multilingual games, this function sets the game object's printLang
* and parseLang properties based on the ScummVM "language" config value.
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 870a5933f78..b84aa1dcbdf 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -54,10 +54,10 @@
namespace Sherlock {
enum {
- kDebugLevelScript = 1 << 0,
- kDebugLevelAdLibDriver = 2 << 0,
- kDebugLevelMT32Driver = 3 << 0,
- kDebugLevelMusic = 4 << 0
+ kDebugLevelScript = 1,
+ kDebugLevelAdLibDriver,
+ kDebugLevelMT32Driver,
+ kDebugLevelMusic,
};
#define SHERLOCK_SCREEN_WIDTH _vm->_screen->width()
diff --git a/engines/stark/debug.h b/engines/stark/debug.h
index 4de226b46d4..c898e02d2a0 100644
--- a/engines/stark/debug.h
+++ b/engines/stark/debug.h
@@ -23,12 +23,12 @@
#define STARK_DEBUG_H
enum {
- kDebugArchive = 1 << 0,
- kDebugXMG = 1 << 1,
- kDebugXRC = 1 << 2,
- kDebugModding = 1 << 3,
- kDebugAnimation = 1 << 4,
- kDebugUnknown = 1 << 5
+ kDebugArchive = 1,
+ kDebugXMG,
+ kDebugXRC,
+ kDebugModding,
+ kDebugAnimation,
+ kDebugUnknown,
};
#endif // STARK_DEBUG_H
diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index 2cb6be1e019..0344873e2d1 100644
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -120,11 +120,11 @@ const int MAX_BAN_FILES = 16;
enum kDebugLevels {
- kDebugSound = 1 << 0,
- kDebugGraphics = 1 << 1,
- kDebugSavegame = 1 << 2,
- kDebugSpace = 1 << 3,
- kDebugGeneral = 1 << 4
+ kDebugSound = 1,
+ kDebugGraphics,
+ kDebugSavegame,
+ kDebugSpace,
+ kDebugGeneral,
};
enum GameMode {
diff --git a/engines/supernova/console.h b/engines/supernova/console.h
index 9e312c06123..03b36807ab6 100644
--- a/engines/supernova/console.h
+++ b/engines/supernova/console.h
@@ -29,10 +29,6 @@ namespace Supernova {
class SupernovaEngine;
class GameManager;
-enum {
- kDebugGeneral = 1 << 0
-};
-
class Console : public GUI::Debugger {
public:
Console(Supernova::SupernovaEngine *vm, Supernova::GameManager *gm);
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index e1c63b663a4..ee8c7020703 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -25,11 +25,6 @@
#include "supernova/supernova.h"
#include "supernova/detection.h"
-static const DebugChannelDef debugFlagList[] = {
- {Supernova::kDebugGeneral, "general", "Supernova general debug channel"},
- DEBUG_CHANNEL_END
-};
-
static const PlainGameDescriptor supernovaGames[] = {
{"msn1", "Mission Supernova - Part 1: The fate of Horst Hummel"},
{"msn2", "Mission Supernova - Part 2: The Doppelg\303\244nger"},
@@ -105,10 +100,6 @@ public:
const char *getOriginalCopyright() const override {
return "Mission Supernova (C) 1994 Thomas and Steffen Dingel";
}
-
- const DebugChannelDef *getDebugChannels() const override {
- return debugFlagList;
- }
};
diff --git a/engines/sword25/sword25.h b/engines/sword25/sword25.h
index 508a4bb20ae..97d5fd41939 100644
--- a/engines/sword25/sword25.h
+++ b/engines/sword25/sword25.h
@@ -53,9 +53,9 @@ enum {
};
enum {
- kDebugScript = 1 << 0,
- kDebugSound = 1 << 1,
- kDebugResource = 1 << 2
+ kDebugScript,
+ kDebugSound,
+ kDebugResource,
};
#define MESSAGE_BASIC 1
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index c7fcf787e42..2a29fec86c7 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -64,17 +64,17 @@ class Pack;
// Engine Debug Flags
enum {
- kDebugActor = (1 << 0),
- kDebugAnimation = (1 << 1),
- kDebugCallbacks = (1 << 2),
- kDebugDialog = (1 << 3),
- kDebugFont = (1 << 4),
- kDebugInventory = (1 << 5),
- kDebugMusic = (1 << 6),
- kDebugObject = (1 << 7),
- kDebugPack = (1 << 8),
- kDebugScene = (1 << 9),
- kDebugSurface = (1 << 10)
+ kDebugActor = 1,
+ kDebugAnimation,
+ kDebugCallbacks,
+ kDebugDialog,
+ kDebugFont,
+ kDebugInventory,
+ kDebugMusic,
+ kDebugObject,
+ kDebugPack,
+ kDebugScene,
+ kDebugSurface,
};
const uint16 kScreenWidth = 320;
diff --git a/engines/tetraedge/detection.h b/engines/tetraedge/detection.h
index 9908ab2a8c0..54da0432eff 100644
--- a/engines/tetraedge/detection.h
+++ b/engines/tetraedge/detection.h
@@ -27,11 +27,11 @@
namespace Tetraedge {
enum TetraedgeDebugChannels {
- kDebugGraphics = 1 << 0,
- kDebugPath = 1 << 1,
- kDebugScan = 1 << 2,
- kDebugFilePath = 1 << 3,
- kDebugScript = 1 << 4
+ kDebugGraphics = 1,
+ kDebugPath,
+ kDebugScan,
+ kDebugFilePath,
+ kDebugScript,
};
enum GameFeatures {
diff --git a/engines/titanic/debugger.h b/engines/titanic/debugger.h
index 1ec5c8155d8..c5c1cbe9475 100644
--- a/engines/titanic/debugger.h
+++ b/engines/titanic/debugger.h
@@ -37,10 +37,10 @@ class CViewItem;
class TitanicEngine;
enum TitanicDebugChannels {
- kDebugCore = 1 << 0,
- kDebugScripts = 1 << 1,
- kDebugGraphics = 1 << 2,
- kDebugStarfield = 1 << 3
+ kDebugCore = 1,
+ kDebugScripts,
+ kDebugGraphics,
+ kDebugStarfield,
};
class Debugger : public GUI::Debugger {
diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index 1f26df8f437..64c83ce3d03 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -90,18 +90,18 @@ enum ToonGameType {
};
enum ToonDebugChannels {
- kDebugAnim = 1 << 0,
- kDebugCharacter = 1 << 1,
- kDebugAudio = 1 << 2,
- kDebugHotspot = 1 << 3,
- kDebugFont = 1 << 4,
- kDebugPath = 1 << 5,
- kDebugMovie = 1 << 6,
- kDebugPicture = 1 << 7,
- kDebugResource = 1 << 8,
- kDebugState = 1 << 9,
- kDebugTools = 1 << 10,
- kDebugText = 1 << 11
+ kDebugAnim = 1,
+ kDebugCharacter,
+ kDebugAudio,
+ kDebugHotspot,
+ kDebugFont,
+ kDebugPath,
+ kDebugMovie,
+ kDebugPicture,
+ kDebugResource,
+ kDebugState,
+ kDebugTools,
+ kDebugText,
};
class Picture;
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 346deb30337..927b45a4cf0 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -298,12 +298,12 @@ struct ProgramConversationData {
};
enum {
- kDebugEngine = 1 << 0,
- kDebugGraphics = 1 << 1,
- kDebugResource = 1 << 2,
- kDebugOpcodes = 1 << 3,
- kDebugMenu = 1 << 4,
- kDebugCharset = 1 << 5
+ kDebugEngine = 1,
+ kDebugGraphics,
+ kDebugResource,
+ kDebugOpcodes,
+ kDebugMenu,
+ kDebugCharset,
};
enum ResourceType {
diff --git a/engines/twine/shared.h b/engines/twine/shared.h
index d7ce54de6fa..832b8f5a2ca 100644
--- a/engines/twine/shared.h
+++ b/engines/twine/shared.h
@@ -805,17 +805,17 @@ inline constexpr T bits(T value, uint8 offset, uint8 bits) {
#define COLOR_158 158
enum kDebugLevels {
- kDebugScriptsMove = 1 << 0,
- kDebugScriptsLife = 1 << 1,
- kDebugTimers = 1 << 2,
- kDebugResources = 1 << 3,
- kDebugImGui = 1 << 4,
- kDebugInput = 1 << 5,
- kDebugMovies = 1 << 6,
- kDebugPalette = 1 << 7,
- kDebugCollision = 1 << 8,
- kDebugAnimation = 1 << 9,
- kDebugHolomap = 1 << 10
+ kDebugScriptsMove = 1,
+ kDebugScriptsLife,
+ kDebugTimers,
+ kDebugResources,
+ kDebugImGui,
+ kDebugInput,
+ kDebugMovies,
+ kDebugPalette,
+ kDebugCollision,
+ kDebugAnimation,
+ kDebugHolomap,
};
} // namespace TwinE
diff --git a/engines/ultima/ultima.h b/engines/ultima/ultima.h
index 1222a9ffe10..1341184ccda 100644
--- a/engines/ultima/ultima.h
+++ b/engines/ultima/ultima.h
@@ -25,12 +25,12 @@
namespace Ultima {
enum UltimaDebugChannels {
- kDebugPath = 1 << 0,
- kDebugGraphics = 1 << 1,
- kDebugVideo = 1 << 2,
- kDebugActor = 1 << 3,
- kDebugObject = 1 << 4,
- kDebugCollision = 1 << 5
+ kDebugPath = 1,
+ kDebugGraphics,
+ kDebugVideo,
+ kDebugActor,
+ kDebugObject,
+ kDebugCollision,
};
} // End of namespace Ultima
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index 67db70e50d4..bd6655d05db 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -65,7 +65,7 @@ namespace Voyeur {
#define MANSION_SCROLL_INC_Y 4
enum VoyeurDebugChannels {
- kDebugScripts = 1 << 0
+ kDebugScripts = 1,
};
enum VoyeurArea { AREA_NONE, AREA_APARTMENT, AREA_INTERFACE, AREA_ROOM, AREA_EVIDENCE };
diff --git a/engines/watchmaker/detection.cpp b/engines/watchmaker/detection.cpp
index 84d94fbb603..9b52bacadb2 100644
--- a/engines/watchmaker/detection.cpp
+++ b/engines/watchmaker/detection.cpp
@@ -31,11 +31,6 @@ static const PlainGameDescriptor watchmakerGames[] = {
{nullptr, nullptr}
};
-static const DebugChannelDef debugFlagList[] = {
- {Watchmaker::kDebugGeneral, "general", "General debug level"},
- DEBUG_CHANNEL_END
-};
-
namespace Watchmaker {
static const ADGameDescription gameDescriptions[] = {
@@ -82,10 +77,6 @@ public:
const char *getOriginalCopyright() const override {
return "The Watchmaker (C) 2002 Trecision SpA.";
}
-
- const DebugChannelDef *getDebugChannels() const override {
- return debugFlagList;
- }
};
REGISTER_PLUGIN_STATIC(WATCHMAKER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, WatchmakerMetaEngineDetection);
diff --git a/engines/watchmaker/watchmaker.h b/engines/watchmaker/watchmaker.h
index 90aac741d95..0924ae91511 100644
--- a/engines/watchmaker/watchmaker.h
+++ b/engines/watchmaker/watchmaker.h
@@ -37,10 +37,6 @@ namespace Watchmaker {
class Console;
-enum WatchmakerDebugChannels {
- kDebugGeneral = 1 << 0
-};
-
class WatchmakerGame : public Engine {
public:
WatchmakerGame(OSystem *syst, const ADGameDescription *gameDesc);
More information about the Scummvm-git-logs
mailing list