[Scummvm-git-logs] scummvm master -> 534157f8e0b4b249423a673d610f800f2adcdf20

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
534157f8e0 DIRECTOR: Put parsing lingo debug ouptu to separate debug flag


Commit: 534157f8e0b4b249423a673d610f800f2adcdf20
    https://github.com/scummvm/scummvm/commit/534157f8e0b4b249423a673d610f800f2adcdf20
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-21T09:22:58+01:00

Commit Message:
DIRECTOR: Put parsing lingo debug ouptu to separate debug flag

Changed paths:
    engines/director/director.cpp
    engines/director/director.h
    engines/director/lingo/lingo-lex.cpp
    engines/director/lingo/lingo-lex.l


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 0577579..bfe9a72 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -42,6 +42,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 		_rnd("director") {
 	DebugMan.addDebugChannel(kDebugLingoExec, "lingoexec", "Lingo Execution");
 	DebugMan.addDebugChannel(kDebugLingoCompile, "lingocompile", "Lingo Compilation");
+	DebugMan.addDebugChannel(kDebugLingoParse, "lingoparse", "Lingo code parsing");
 	DebugMan.addDebugChannel(kDebugLoading, "loading", "Loading");
 	DebugMan.addDebugChannel(kDebugImages, "images", "Image drawing");
 	DebugMan.addDebugChannel(kDebugText, "text", "Text rendering");
diff --git a/engines/director/director.h b/engines/director/director.h
index 805a51c..fdbe8de 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -58,7 +58,8 @@ enum {
 	kDebugLoading		= 1 << 2,
 	kDebugImages		= 1 << 3,
 	kDebugText			= 1 << 4,
-	kDebugEvents		= 1 << 5
+	kDebugEvents		= 1 << 5,
+	kDebugLingoParse	= 1 << 6
 };
 
 extern byte defaultPalette[768];
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index c9a7be7..48a5166 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -2549,7 +2549,7 @@ namespace Director {
 int Lingo::parse(const char *code) {
 	YY_BUFFER_STATE bp;
 
-	if (debugChannelSet(-1, kDebugLingoCompile))
+	if (debugChannelSet(-1, kDebugLingoParse))
 		yydebug = 1;
 	else
 		yydebug = 0;
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index a53a2f0..37bad12 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -325,7 +325,7 @@ namespace Director {
 int Lingo::parse(const char *code) {
 	YY_BUFFER_STATE bp;
 
-	if (debugChannelSet(-1, kDebugLingoCompile))
+	if (debugChannelSet(-1, kDebugLingoParse))
 		yydebug = 1;
 	else
 		yydebug = 0;