aboutsummaryrefslogtreecommitdiff
path: root/gob/gob.cpp
diff options
context:
space:
mode:
authorSven Hesse2006-02-02 21:12:00 +0000
committerSven Hesse2006-02-02 21:12:00 +0000
commitda33aa319bf5b5ae91650eaa9d24ef412a5d9af5 (patch)
tree402fb5253ac1d307f3d1370dae8b206879771ea1 /gob/gob.cpp
parentd88462e7d68c4052fd2927ba7fc3be5566a1b9d9 (diff)
downloadscummvm-rg350-da33aa319bf5b5ae91650eaa9d24ef412a5d9af5.tar.gz
scummvm-rg350-da33aa319bf5b5ae91650eaa9d24ef412a5d9af5.tar.bz2
scummvm-rg350-da33aa319bf5b5ae91650eaa9d24ef412a5d9af5.zip
Added/Changed o2_evaluateStore(), o2_palLoad(), o2_setRenderFlags(), o2_loadTot(), parseVarIndex(), parseValExpr() and parseExpr() for Gob2
svn-id: r20353
Diffstat (limited to 'gob/gob.cpp')
-rw-r--r--gob/gob.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/gob/gob.cpp b/gob/gob.cpp
index 7ce0d6372b..eb8f94032c 100644
--- a/gob/gob.cpp
+++ b/gob/gob.cpp
@@ -298,14 +298,17 @@ int GobEngine::init(GameDetector &detector) {
_mult = new Mult(this);
_pack = new Pack();
_palanim = new PalAnim(this);
- _parse = new Parse(this);
_scenery = new Scenery(this);
_gtimer = new GTimer();
_util = new Util(this);
- if (_features & Gob::GF_GOB1)
+ if (_features & Gob::GF_GOB1) {
_inter = new Inter_v1(this);
- else if (_features & Gob::GF_GOB2)
+ _parse = new Parse_v1(this);
+ }
+ else if (_features & Gob::GF_GOB2) {
_inter = new Inter_v2(this);
+ _parse = new Parse_v2(this);
+ }
else
error("GobEngine::init(): Unknown version of game engine");
if ((_features & Gob::GF_MAC) || (_features & Gob::GF_GOB1))