LASTEXPRESS: Remove Engine Specific All Debug Level.

This is replaced by the global "all" option for debugflags and defining
this triggers a warning about the conflict at runtime.

3 files changed, 11 insertions, 14 deletions

diff --git a/engines/lastexpress/data/cursor.cpp b/engines/lastexpress/data/cursor.cpp
index fe1092a7ef..0a2e853258 100644
--- a/engines/lastexpress/data/cursor.cpp
+++ b/engines/lastexpress/data/cursor.cpp
@@ -50,7 +50,7 @@ bool Cursor::load(Common::SeekableReadStream *stream) {
 	for (int i = 0; i < kCursorMAX; i++) {
 		_cursors[i].hotspotX = data->readUint16LE();
 		_cursors[i].hotspotY = data->readUint16LE();
-		debugC(15, kLastExpressDebugCursor | kLastExpressDebugAll,
+		debugC(15, kLastExpressDebugCursor,
 			"Cursor %d hotspot x: %d, hotspot y: %d",
 			i, _cursors[i].hotspotX, _cursors[i].hotspotY);
 	}
@@ -84,7 +84,7 @@ void Cursor::setStyle(CursorStyle style) {
 	if (style == _current)
 		return;
 
-	debugC(10, kLastExpressDebugCursor | kLastExpressDebugAll, "Cursor: setting style: %d", style);
+	debugC(10, kLastExpressDebugCursor, "Cursor: setting style: %d", style);
 
 	// Save the new cursor
 	_current = style;
diff --git a/engines/lastexpress/debug.h b/engines/lastexpress/debug.h
index 7a1e2648fb..75786480f8 100644
--- a/engines/lastexpress/debug.h
+++ b/engines/lastexpress/debug.h
@@ -32,17 +32,15 @@
 namespace LastExpress {
 
 enum {
-	kLastExpressDebugAll      = 1 << 0,
-	kLastExpressDebugGraphics = 1 << 1,
-	kLastExpressDebugResource = 1 << 2,
-	kLastExpressDebugCursor   = 1 << 3,
-	kLastExpressDebugSound    = 1 << 4,
-	kLastExpressDebugSubtitle = 1 << 5,
-	kLastExpressDebugSavegame = 1 << 6,
-	kLastExpressDebugLogic    = 1 << 7,
-	kLastExpressDebugScenes   = 1 << 8,
-	kLastExpressDebugUnknown  = 1 << 9
-	// the current limitation is 32 debug levels (1 << 31 is the last one)
+	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
 };
 
 class LastExpressEngine;
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 688d084614..92cb0f50cc 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -70,7 +70,6 @@ LastExpressEngine::LastExpressEngine(OSystem *syst, const ADGameDescription *gd)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data");
 
 	// Initialize the custom debug levels
-	DebugMan.addDebugChannel(kLastExpressDebugAll, "All", "Debug everything");
 	DebugMan.addDebugChannel(kLastExpressDebugGraphics, "Graphics", "Debug graphics & animation/sequence playback");
 	DebugMan.addDebugChannel(kLastExpressDebugResource, "Resource", "Debug resource management");
 	DebugMan.addDebugChannel(kLastExpressDebugCursor, "Cursor", "Debug cursor handling");