thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing the Parse object from GobEngine

Browse source 
svn-id: r41761
This commit is contained in:
Sven Hesse 2009-06-22 10:29:48 +00:00
parent 7d005f62c3
commit 65fc23f962
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/gob/gob.cpp
View file

@ -102,12 +102,12 @@ void PauseDialog::handleKeyDown(Common::KeyState state) {
GobEngine::GobEngine(OSystem *syst) : Engine(syst) { GobEngine::GobEngine(OSystem *syst) : Engine(syst) {
_sound = 0; _mult = 0; _game = 0; _sound = 0; _mult = 0; _game = 0;
_global = 0; _dataIO = 0; _goblin = 0; _global = 0; _dataIO = 0; _goblin = 0;
_vidPlayer = 0; _init = 0; _inter = 0; _vidPlayer = 0; _init = 0; _inter = 0;
_map = 0; _palAnim = 0; _parse = 0; _map = 0; _palAnim = 0; _scenery = 0;
_scenery = 0; _draw = 0; _util = 0; _draw = 0; _util = 0; _video = 0;
_video = 0; _saveLoad = 0; _saveLoad = 0;
_pauseStart = 0; _pauseStart = 0;
@ -332,7 +332,6 @@ bool GobEngine::initGameParts() {
_palAnim = new PalAnim(this); _palAnim = new PalAnim(this);
_vidPlayer = new VideoPlayer(this); _vidPlayer = new VideoPlayer(this);
_sound = new Sound(this); _sound = new Sound(this);
_parse = new Parse(this);
switch (_gameType) { switch (_gameType) {
case kGameTypeGeisha: case kGameTypeGeisha:
@ -497,7 +496,6 @@ void GobEngine::deinitGameParts() {
delete _inter; _inter = 0; delete _inter; _inter = 0;
delete _map; _map = 0; delete _map; _map = 0;
delete _palAnim; _palAnim = 0; delete _palAnim; _palAnim = 0;
delete _parse; _parse = 0;
delete _scenery; _scenery = 0; delete _scenery; _scenery = 0;
delete _draw; _draw = 0; delete _draw; _draw = 0;
delete _util; _util = 0; delete _util; _util = 0;

2
engines/gob/gob.h
View file

@ -52,7 +52,6 @@ class Inter;
class Map; class Map;
class Mult; class Mult;
class PalAnim; class PalAnim;
class Parse;
class Scenery; class Scenery;
class Util; class Util;
class SaveLoad; class SaveLoad;
@ -197,7 +196,6 @@ public:
Map *_map; Map *_map;
Mult *_mult; Mult *_mult;
PalAnim *_palAnim; PalAnim *_palAnim;
Parse *_parse;
Scenery *_scenery; Scenery *_scenery;
Inter *_inter; Inter *_inter;
SaveLoad *_saveLoad; SaveLoad *_saveLoad;

1
engines/gob/script.h
View file

@ -32,6 +32,7 @@
namespace Gob { namespace Gob {
class GobEngine; class GobEngine;
class Parse;
class Script { class Script {
public: public: