aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorThierry Crozat2018-12-28 22:37:30 +0100
committerThierry Crozat2018-12-28 22:37:30 +0100
commit787a62c62d3a5864f0d221ca9acf12b8b332239b (patch)
treec261649fb8520dae2c4ddc7a54617b3ed87cd03f /engines
parent3fa3967cff99457bbb9f18c36284af78f3ef5678 (diff)
downloadscummvm-rg350-787a62c62d3a5864f0d221ca9acf12b8b332239b.tar.gz
scummvm-rg350-787a62c62d3a5864f0d221ca9acf12b8b332239b.tar.bz2
scummvm-rg350-787a62c62d3a5864f0d221ca9acf12b8b332239b.zip
GLK: Fix multiple definitions of litCount variable
Diffstat (limited to 'engines')
-rw-r--r--engines/glk/alan2/parse.cpp2
-rw-r--r--engines/glk/alan2/util.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/glk/alan2/parse.cpp b/engines/glk/alan2/parse.cpp
index 216f4746c7..7cb34c1c8c 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 702cdf1f71..73d65e2b30 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