[Scummvm-cvs-logs] scummvm master -> 3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d

[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:
3ac815a236 DREAMWEB: 'credits' ported to C++


Commit: 3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d
    https://github.com/scummvm/scummvm/commit/3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-02T04:18:39-08:00

Commit Message:
DREAMWEB: 'credits' ported to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2280463..0eb0a3e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -343,6 +343,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'sparky',
 	'singlekey',
 	'showkeypad',
+	'credits',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a9fd0a6..e6cc683 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2631,12 +2631,6 @@ void DreamGenContext::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamGenContext::credits() {
-	STACK_CHECK;
-	clearPalette();
-	realCredits();
-}
-
 void DreamGenContext::bibleQuote() {
 	STACK_CHECK;
 	mode640x480();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index dbc21d1..e8c7ea9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -1018,7 +1018,6 @@ public:
 	void searchForFiles();
 	void monkSpeaking();
 	void clearRest();
-	void credits();
 	void madmanRun();
 	void randomNum1();
 	void keeper();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 46e8496..2352f9f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -115,7 +115,10 @@ void DreamGenContext::dreamweb() {
 			titles();
 			if (quitRequested())
 				return; // exit game
-			credits();
+
+			// "credits"
+			clearPalette();
+			realCredits();
 
 			if (quitRequested())
 				return; // exit game