diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /engines/gob/gob.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/gob/gob.cpp')
| -rw-r--r-- | engines/gob/gob.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index ea7e329480..7bb7928406 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -402,7 +402,6 @@ bool GobEngine::initGameParts() { _game = new Game(this); switch (_gameType) { - case kGameTypeGeisha: case kGameTypeGob1: _init = new Init_v1(this); _video = new Video_v1(this); @@ -414,6 +413,17 @@ bool GobEngine::initGameParts() { _scenery = new Scenery_v1(this); break; + case kGameTypeGeisha: + _init = new Init_Geisha(this); + _video = new Video_v1(this); + _inter = new Inter_Geisha(this); + _mult = new Mult_v1(this); + _draw = new Draw_v1(this); + _map = new Map_v1(this); + _goblin = new Goblin_v1(this); + _scenery = new Scenery_v1(this); + break; + case kGameTypeFascination: _init = new Init_Fascination(this); _video = new Video_v2(this); |