diff options
| author | Sven Hesse | 2009-06-22 10:29:48 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-06-22 10:29:48 +0000 |
| commit | 65fc23f962e408f196f19888fd03d78d00d40f20 (patch) | |
| tree | 5a80f9d92e97411448c3ad743f3daa3ab2def02c | |
| parent | 7d005f62c380ffbc9e4cae0e99afc06ed30d1dd4 (diff) | |
| download | scummvm-rg350-65fc23f962e408f196f19888fd03d78d00d40f20.tar.gz scummvm-rg350-65fc23f962e408f196f19888fd03d78d00d40f20.tar.bz2 scummvm-rg350-65fc23f962e408f196f19888fd03d78d00d40f20.zip | |
Removing the Parse object from GobEngine
svn-id: r41761
| -rw-r--r-- | engines/gob/gob.cpp | 14 | ||||
| -rw-r--r-- | engines/gob/gob.h | 2 | ||||
| -rw-r--r-- | engines/gob/script.h | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index bea1df70a7..3f448e7eb8 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -102,12 +102,12 @@ void PauseDialog::handleKeyDown(Common::KeyState state) { GobEngine::GobEngine(OSystem *syst) : Engine(syst) { - _sound = 0; _mult = 0; _game = 0; - _global = 0; _dataIO = 0; _goblin = 0; - _vidPlayer = 0; _init = 0; _inter = 0; - _map = 0; _palAnim = 0; _parse = 0; - _scenery = 0; _draw = 0; _util = 0; - _video = 0; _saveLoad = 0; + _sound = 0; _mult = 0; _game = 0; + _global = 0; _dataIO = 0; _goblin = 0; + _vidPlayer = 0; _init = 0; _inter = 0; + _map = 0; _palAnim = 0; _scenery = 0; + _draw = 0; _util = 0; _video = 0; + _saveLoad = 0; _pauseStart = 0; @@ -332,7 +332,6 @@ bool GobEngine::initGameParts() { _palAnim = new PalAnim(this); _vidPlayer = new VideoPlayer(this); _sound = new Sound(this); - _parse = new Parse(this); switch (_gameType) { case kGameTypeGeisha: @@ -497,7 +496,6 @@ void GobEngine::deinitGameParts() { delete _inter; _inter = 0; delete _map; _map = 0; delete _palAnim; _palAnim = 0; - delete _parse; _parse = 0; delete _scenery; _scenery = 0; delete _draw; _draw = 0; delete _util; _util = 0; diff --git a/engines/gob/gob.h b/engines/gob/gob.h index 43e2270354..ecef9fa3ef 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -52,7 +52,6 @@ class Inter; class Map; class Mult; class PalAnim; -class Parse; class Scenery; class Util; class SaveLoad; @@ -197,7 +196,6 @@ public: Map *_map; Mult *_mult; PalAnim *_palAnim; - Parse *_parse; Scenery *_scenery; Inter *_inter; SaveLoad *_saveLoad; diff --git a/engines/gob/script.h b/engines/gob/script.h index fce1a5447c..48de1b9e76 100644 --- a/engines/gob/script.h +++ b/engines/gob/script.h @@ -32,6 +32,7 @@ namespace Gob { class GobEngine; +class Parse; class Script { public: |