[Scummvm-cvs-logs] scummvm master -> 90861ce48afa81dcb934acac161ff75cb3cee80f
digitall
digitall at scummvm.org
Mon Dec 5 17:04:05 CET 2011
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:
90861ce48a DREAMWEB: 'biblequote' ported to C++
Commit: 90861ce48afa81dcb934acac161ff75cb3cee80f
https://github.com/scummvm/scummvm/commit/90861ce48afa81dcb934acac161ff75cb3cee80f
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-05T08:02:46-08:00
Commit Message:
DREAMWEB: 'biblequote' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 346bf9e..00aac10 100755
--- 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
index 6e44289..7c92c4f 100644
--- 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
index e2ffcbe..ebd7698 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -787,7 +787,6 @@ public:
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
index 754388d..5b329f2 100644
--- 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
index 170d10b..2715863 100644
--- 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
More information about the Scummvm-git-logs
mailing list