aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/gob.cpp
diff options
context:
space:
mode:
authorSven Hesse2006-05-31 08:44:14 +0000
committerSven Hesse2006-05-31 08:44:14 +0000
commit05499f58dd2e79cae46bd4f250df946261bdac35 (patch)
tree20e9ab41a9e9039a85edc9ab891587f7b55a9534 /engines/gob/gob.cpp
parent321acd2740936efeb85eb5b771cbfc86a3545e9b (diff)
downloadscummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.tar.gz
scummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.tar.bz2
scummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.zip
- Removed usage of OSystem::quit(), added a _quitRequested variable
- Fixed some leaks, unitialized memory and delete/delete[]-errors svn-id: r22790
Diffstat (limited to 'engines/gob/gob.cpp')
-rw-r--r--engines/gob/gob.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 61d64d6442..fb983a6749 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -141,6 +141,7 @@ GobEngine::GobEngine(OSystem * syst, uint32 features, Common::Language lang)
_features = features;
_language = lang;
_copyProtection = ConfMan.getBool("copy_protection");
+ _quitRequested = false;
Common::addSpecialDebugLevel(DEBUG_FUNCOP, "FuncOpcodes", "Script FuncOpcodes debug level");
Common::addSpecialDebugLevel(DEBUG_DRAWOP, "DrawOpcodes", "Script DrawOpcodes debug level");
@@ -173,7 +174,6 @@ GobEngine::~GobEngine() {
delete _scenery;
delete _gtimer;
delete _util;
- delete _inter;
delete _music;
}
@@ -188,7 +188,7 @@ int GobEngine::go() {
}
void GobEngine::shutdown() {
- _system->quit();
+ _quitRequested = true;
}
int GobEngine::init() {