[Scummvm-cvs-logs] scummvm master -> 59458c9b155bb5144994c1442c5968b8d1873608

[digitall]

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

Summary:
59458c9b15 DREAMWEB: Simplify finalization call in dreamweb main function.


Commit: 59458c9b155bb5144994c1442c5968b8d1873608
    https://github.com/scummvm/scummvm/commit/59458c9b155bb5144994c1442c5968b8d1873608
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-28T18:58:19-08:00

Commit Message:
DREAMWEB: Simplify finalization call in dreamweb main function.

Thanks to Fingolfin for the suggestion.

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



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 67e72eb..91aabc8 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -370,6 +370,7 @@ Common::Error DreamWebEngine::run() {
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
+	dreamwebFinalize();
 	_quitRequested = false;
 
 	_timer->removeTimerProc(vSyncInterrupt);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9aa6135..b1e86d0 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -507,8 +507,6 @@ void DreamWebEngine::dreamweb() {
 	}
 
 	seeCommandTail();
-	// soundStartup used to be done here...
-	// setKeyboardInt used to be done here...
 	allocateBuffers();
 
 	// setMouse
@@ -563,10 +561,8 @@ void DreamWebEngine::dreamweb() {
 			cls();
 			setMode();
 			decide();
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			if (_getBack == 4)
 				startNewGame = false; // savegame has been loaded
@@ -584,19 +580,15 @@ void DreamWebEngine::dreamweb() {
 			if (!_quitRequested) // "titlesearly"
 				intro();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			// "credits"
 			clearPalette();
 			realCredits();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			clearChanges();
 			setMode();
@@ -617,22 +609,17 @@ void DreamWebEngine::dreamweb() {
 			_volumeTo = 0;
 			_volumeDirection = -1;
 			_commandType = 255;
-
 		}
 
 		// main loop
 		while (true) {
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			screenUpdate();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			if (_wonGame) {
 				// "endofgame"
@@ -641,7 +628,6 @@ void DreamWebEngine::dreamweb() {
 				hangOn(200);
 				endGame();
 				quickQuit2();
-				dreamwebFinalize();
 				return;
 			}
 
@@ -682,8 +668,6 @@ void DreamWebEngine::dreamweb() {
 		hangOn(100);
 
 	}
-
-	dreamwebFinalize();
 }
 
 void DreamWebEngine::loadTextFile(TextFile &file, const char *fileName)