WAGE: Graceful engine quitting

scummvm · Jan 3, 2016 · 562355e · 562355e
1 parent d66c3a2
commit 562355e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
@@ -78,13 +78,18 @@ WageEngine::WageEngine(OSystem *syst, const ADGameDescription *desc) : Engine(sy
 
 	_commandWasQuick = false;
 
+	_shouldQuit = false;
+
 	debug("WageEngine::WageEngine()");
 }
 
 WageEngine::~WageEngine() {
 	debug("WageEngine::~WageEngine()");
 
 	DebugMan.clearAllDebugChannels();
+	delete _world;
+	delete _resManager;
+	delete _gui;
 	delete _rnd;
 }
 
@@ -113,7 +118,9 @@ Common::Error WageEngine::run() {
 	processTurn(&input, NULL);
 	_temporarilyHidden = false;
 
-	while (true) {
+	_shouldQuit = false;
+
+	while (!_shouldQuit) {
 		processEvents();
 
 		_gui->draw();
@@ -138,7 +145,7 @@ void WageEngine::processEvents() {
 	while (_eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case Common::EVENT_QUIT:
-			error("Exiting");
+			_shouldQuit = true;
 			break;
 		case Common::EVENT_MOUSEMOVE:
 			_gui->mouseMove(event.mouse.x, event.mouse.y);

diff --git a/engines/wage/wage.h b/engines/wage/wage.h
@@ -163,6 +163,7 @@ class WageEngine : public Engine {
 
 	bool _commandWasQuick;
 
+	bool _shouldQuit;
 };
 
 // Example console class