[Scummvm-cvs-logs] scummvm master -> 5ab404f5bae87b6aac031232259ead2b3cf6386b

[wjp]

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:
5ab404f5ba DREAMWEB: Reduce code duplication


Commit: 5ab404f5bae87b6aac031232259ead2b3cf6386b
    https://github.com/scummvm/scummvm/commit/5ab404f5bae87b6aac031232259ead2b3cf6386b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-07T15:08:25-08:00

Commit Message:
DREAMWEB: Reduce code duplication

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 637df60..839665d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3245,20 +3245,14 @@ void DreamGenContext::runIntroSeq() {
 	do {
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1) {
-			getRidOfTempText();
-			clearBeforeLoad();
-			return; // "earlyendrun"
-		}
+		if (data.byte(kLasthardkey) == 1)
+			break;
 
 		spriteUpdate();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1) {
-			getRidOfTempText();
-			clearBeforeLoad();
-			return; // "earlyendrun"
-		}
+		if (data.byte(kLasthardkey) == 1)
+			break;
 
 		delEverything();
 		printSprites();
@@ -3267,23 +3261,23 @@ void DreamGenContext::runIntroSeq() {
 		useTimedText();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1) {
-			getRidOfTempText();
-			clearBeforeLoad();
-			return; // "earlyendrun"
-		}
+		if (data.byte(kLasthardkey) == 1)
+			break;
 
 		dumpMap();
 		dumpTimedText();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1) {
-			getRidOfTempText();
-			clearBeforeLoad();
-			return; // "earlyendrun"
-		}
+		if (data.byte(kLasthardkey) == 1)
+			break;
+
+	} while (data.byte(kGetback) != 1);
 
-		} while (data.byte(kGetback) != 1);
+
+	if (data.byte(kLasthardkey) == 1) {
+		getRidOfTempText();
+		clearBeforeLoad();
+	}
 
 	// These were not called in this program arc
 	// in the original code.. Bug?