diff options
| author | D G Turner | 2011-12-02 12:18:39 +0000 |
|---|---|---|
| committer | D G Turner | 2011-12-02 12:18:39 +0000 |
| commit | 3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d (patch) | |
| tree | 8897ae53d3346f37144e035e300bfde09776c2ff | |
| parent | 3f02cfe77126335d45ea8b97d90d5bd93bfb61ac (diff) | |
| download | scummvm-rg350-3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d.tar.gz scummvm-rg350-3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d.tar.bz2 scummvm-rg350-3ac815a2368e2ea8f5b6e66e77e67e4047dc3a2d.zip | |
DREAMWEB: 'credits' ported to C++
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 6 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 2280463264..0eb0a3ec40 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 a9fd0a6d01..e6cc6834ef 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 dbc21d1c87..e8c7ea92c3 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 46e849628a..2352f9f1ce 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 |