[Scummvm-git-logs] scummvm master -> 787a62c62d3a5864f0d221ca9acf12b8b332239b

[criezy]

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:
787a62c62d GLK: Fix multiple definitions of litCount variable


Commit: 787a62c62d3a5864f0d221ca9acf12b8b332239b
    https://github.com/scummvm/scummvm/commit/787a62c62d3a5864f0d221ca9acf12b8b332239b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-28T22:37:30+01:00

Commit Message:
GLK: Fix multiple definitions of litCount variable

Changed paths:
    engines/glk/alan2/parse.cpp
    engines/glk/alan2/util.h


diff --git a/engines/glk/alan2/parse.cpp b/engines/glk/alan2/parse.cpp
index 216f474..7cb34c1 100644
--- a/engines/glk/alan2/parse.cpp
+++ b/engines/glk/alan2/parse.cpp
@@ -33,6 +33,8 @@
 
 namespace Glk {
 namespace Alan2 {
+	
+uint32 litCount = 0;
 
 // All procedures for getting a command and turning it into a list of
 // dictionary entries are placed here.
diff --git a/engines/glk/alan2/util.h b/engines/glk/alan2/util.h
index 702cdf1..73d65e2 100644
--- a/engines/glk/alan2/util.h
+++ b/engines/glk/alan2/util.h
@@ -32,7 +32,7 @@ namespace Alan2 {
 
 // TODO: Move these
 extern LitElem *litValues;
-uint32 litCount = 0;	// for LITMAX
+extern uint32 litCount;	// for LITMAX - defined in parse.cpp
 extern ActElem *acts;	// Actor table pointer
 extern ObjElem *objs;	// Object table pointer