diff options
Diffstat (limited to 'engines/cge/cge.cpp')
| -rw-r--r-- | engines/cge/cge.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 4ed2932cd9..34e7d3f2f9 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -53,9 +53,8 @@ CGEEngine::CGEEngine(OSystem *syst, const ADGameDescription *gameDescription) _oldLev = 0; _pocPtr = 0; _bitmapPalette = NULL; - - - + _quitFlag = false; + _showBoundariesFl = false; } void CGEEngine::initSceneValues() { @@ -91,7 +90,7 @@ void CGEEngine::init() { _font = new Font(this, "CGE"); _text = new Text(this, "CGE"); _talk = NULL; - _vga = new Vga(); + _vga = new Vga(this); _sys = new System(this); _pocLight = new PocLight(this); for (int i = 0; i < kPocketNX; i++) @@ -144,7 +143,6 @@ void CGEEngine::deinit() { DebugMan.clearAllDebugChannels(); delete _console; - _midiPlayer->killMidi(); // Delete engine objects delete _vga; @@ -161,8 +159,9 @@ void CGEEngine::deinit() { delete _keyboard; delete _mouse; delete _eventManager; - delete _fx; delete _sound; + delete _fx; + delete _midiPlayer; delete _font; delete _commandHandler; delete _commandHandlerTurbo; @@ -214,7 +213,8 @@ bool CGEEngine::canLoadGameStateCurrently() { } bool CGEEngine::canSaveGameStateCurrently() { - return (_startupMode == 0) && _mouse->_active; + return (_startupMode == 0) && _mouse->_active && + _commandHandler->idle() && !_hero->_flags._hide; } } // End of namespace CGE |