DREAMWEB: 'biblequote' ported to C++

scummvm · Dec 5, 2011 · 90861ce · 90861ce
1 parent e19f789
commit 90861ce
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
@@ -147,6 +147,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'autosetwalk',
 	'backobject',
 	'barwoman',
+	'biblequote',
 	'blockget',
 	'blocknametext',
 	'bothchannels',

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
@@ -2396,33 +2396,6 @@ void DreamGenContext::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamGenContext::bibleQuote() {
-	STACK_CHECK;
-	mode640x480();
-	dx = 1100;
-	showPCX();
-	fadeScreenUps();
-	cx = 80;
-	hangOne();
-	_cmp(data.byte(kLasthardkey), 1);
-	if (flags.z())
-		goto biblequotearly;
-	cx = 560;
-	hangOne();
-	_cmp(data.byte(kLasthardkey), 1);
-	if (flags.z())
-		goto biblequotearly;
-	fadeScreenDowns();
-	cx = 200;
-	hangOne();
-	_cmp(data.byte(kLasthardkey), 1);
-	if (flags.z())
-		goto biblequotearly;
-	cancelCh0();
-biblequotearly:
-	data.byte(kLasthardkey) = 0;
-}
-
 void DreamGenContext::intro() {
 	STACK_CHECK;
 	dx = 1035;

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
@@ -787,7 +787,6 @@ class DreamGenContext : public Context {
 	void candles1();
 	void showOpBox();
 	void clearBeforeLoad();
-	void bibleQuote();
 	void doFade();
 	void useTrainer();
 	void dumpCurrent();

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -3148,5 +3148,36 @@ void DreamGenContext::hangOne() {
 	hangOne(cx);
 }
 
+void DreamGenContext::bibleQuote() {
+	mode640x480();
+
+	showPCX("DREAMWEB.I00");
+	fadeScreenUps();
+
+	hangOne(80);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	hangOne(560);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	fadeScreenDowns();
+
+	hangOne(200);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	cancelCh0();
+
+	data.byte(kLasthardkey) = 0;
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -451,5 +451,6 @@
 	void hangOne();
 	void showPCX(const ::Common::String &name);
 	void showPCX();
+	void bibleQuote();
 
 #endif