aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2008-06-04 01:04:26 +0000
committerNicola Mettifogo2008-06-04 01:04:26 +0000
commitfe6ab4227e070a6ef6ae5528025c2b2ea9a0b271 (patch)
tree8d61df439b7da308c3e88e7d426969b0adebf892
parent4b5ed050f176588067a355506792d75b7958bf21 (diff)
downloadscummvm-rg350-fe6ab4227e070a6ef6ae5528025c2b2ea9a0b271.tar.gz
scummvm-rg350-fe6ab4227e070a6ef6ae5528025c2b2ea9a0b271.tar.bz2
scummvm-rg350-fe6ab4227e070a6ef6ae5528025c2b2ea9a0b271.zip
Return to menu after introduction has played (with glitches).
svn-id: r32523
-rw-r--r--engines/parallaction/graphics.cpp4
-rw-r--r--engines/parallaction/graphics.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 9110731a04..58fb02a750 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -33,10 +33,6 @@
namespace Parallaction {
-
-typedef Common::HashMap<Common::String, int32, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> VarMap;
-VarMap _vars;
-
void Gfx::registerVar(const Common::String &name, int32 initialValue) {
if (_vars.contains(name)) {
warning("Variable '%s' already registered, ignoring initial value.\n", name.c_str());
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 8f1c14aef0..894e0fd678 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -452,10 +452,13 @@ enum {
kBackgroundSlide = 2
};
+typedef Common::HashMap<Common::String, int32, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> VarMap;
+
class Gfx {
public:
Disk *_disk;
+ VarMap _vars;
GfxObjList _gfxobjList[3];
GfxObj* loadAnim(const char *name);