[Scummvm-cvs-logs] scummvm master -> d09be37c69894929ed4925994cd41b4d72e412e0

[wjp]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
73ebccc30a DREAMWEB: Allow quit during ending
d09be37c69 DREAMWEB: Minor clean up


Commit: 73ebccc30a8cbfe0353efc8851e6c67fd62562ee
    https://github.com/scummvm/scummvm/commit/73ebccc30a8cbfe0353efc8851e6c67fd62562ee
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-29T05:39:43-08:00

Commit Message:
DREAMWEB: Allow quit during ending

Changed paths:
    engines/dreamweb/titles.cpp



diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 8b56ffc..aa0f3bd 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -28,6 +28,8 @@ namespace DreamWeb {
 void DreamWebEngine::endGame() {
 	loadTempText("DREAMWEB.T83");
 	monkSpeaking();
+	if (_quitRequested)
+		return;
 	gettingShot();
 	getRidOfTempText();
 	_volumeTo = 7;
@@ -57,6 +59,8 @@ void DreamWebEngine::monkSpeaking() {
 
 			do {
 				waitForVSync();
+				if (_quitRequested)
+					return;
 			} while (_channel1Playing != 255);
 		}
 	} else {
@@ -71,6 +75,8 @@ void DreamWebEngine::monkSpeaking() {
 				clearWork();
 				showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
 				hangOnP(240);
+				if (_quitRequested)
+					return;
 			} while (printResult != 0);
 		}
 	}
@@ -251,7 +257,7 @@ void DreamWebEngine::runEndSeq() {
 		dumpMap();
 		dumpTimedText();
 		vSync();
-	} while (_getBack != 1);
+	} while (_getBack != 1 && !_quitRequested);
 }
 
 void DreamWebEngine::loadIntroRoom() {


Commit: d09be37c69894929ed4925994cd41b4d72e412e0
    https://github.com/scummvm/scummvm/commit/d09be37c69894929ed4925994cd41b4d72e412e0
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-29T05:39:53-08:00

Commit Message:
DREAMWEB: Minor clean up

Changed paths:
    engines/dreamweb/dreamweb.h
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index c0f518d..e261010 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -944,10 +944,8 @@ public:
 	void dreamweb();
 	void screenUpdate();
 	void startup1();
-	void quickQuit();
 	void readOneBlock();
 	void seeCommandTail();
-	void quickQuit2();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b1e86d0..5f05f29 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -457,10 +457,9 @@ static const Atmosphere g_atmosphereList[] = {
 };
 
 void DreamWebEngine::dreamwebFinalize() {
-	// The engine will need some cleaner finalization (destructor?), let's put it here for now
+	// The engine will need some cleaner finalization (destructor?), let's put
+	// it here for now
 
-	// FIXME: This triggers "Deallocating non existent segment" errors when
-	// quitting from a menu.
 	getRidOfAll();
 
 	_icons1.clear();
@@ -627,7 +626,6 @@ void DreamWebEngine::dreamweb() {
 				fadeScreenDowns();
 				hangOn(200);
 				endGame();
-				quickQuit2();
 				return;
 			}
 
@@ -837,14 +835,6 @@ void DreamWebEngine::seeCommandTail() {
 	_brightness = 1;
 }
 
-void DreamWebEngine::quickQuit() {
-	quit();
-}
-
-void DreamWebEngine::quickQuit2() {
-	quit();
-}
-
 void DreamWebEngine::readMouse() {
 	_oldButton = _mouseButton;
 	uint16 state = readMouseState();