- Sound! Still a bit glitchy, though:

  - Negative frequences?!? Maybe "SFX"?
  - No sound for a small part of the intro
    (there aren't any sndKeys covering that part either)
  - A rythm-instrument (hi-hat?) in the titlemusic isn't played as one
- More differences in the drawing functions fleshed out
- Some of the goblin handling functions written
- More unnamed functions and variables, wheeee...

svn-id: r22410

1 files changed, 5 insertions, 3 deletions

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 7fa54445f6..b883de37c0 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -196,8 +196,6 @@ int GobEngine::init() {
 	_anim = new Anim();
 	_cdrom = new CDROM(this);
 	_dataio = new DataIO(this);
-	_goblin = new Goblin(this);
-	_map = new Map(this);
 	_pack = new Pack();
 	_palanim = new PalAnim(this);
 	_scenery = new Scenery(this);
@@ -211,6 +209,8 @@ int GobEngine::init() {
 		_game = new Game_v1(this);
 		_video = new Video_v1(this);
 		_init = new Init_v1(this);
+		_map = new Map_v1(this);
+		_goblin = new Goblin_v1(this);
 	}
 	else if (_features & Gob::GF_GOB2) {
 		_inter = new Inter_v2(this);
@@ -220,10 +220,12 @@ int GobEngine::init() {
 		_game = new Game_v2(this);
 		_video = new Video_v2(this);
 		_init = new Init_v2(this);
+		_map = new Map_v2(this);
+		_goblin = new Goblin_v2(this);
 	}
 	else
 		error("GobEngine::init(): Unknown version of game engine");
-	if ((_features & Gob::GF_MAC) || (_features & Gob::GF_GOB1))
+	if ((_features & Gob::GF_MAC) || (_features & Gob::GF_GOB1) || (_features & Gob::GF_GOB2))
 		_music = new Music(this);
 
 	_system->beginGFXTransaction();