diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 10 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 7 |
4 files changed, 9 insertions, 14 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index ab6390f84f..a687e75006 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -459,6 +459,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'switchryanon', 'textforend', 'textformonk', + 'titles', 'transferinv', 'transfertext', 'trysoundalloc', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 26142a2590..172e822749 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2315,16 +2315,6 @@ void DreamGenContext::initialMonCols() { showGroup(); } -void DreamGenContext::titles() { - STACK_CHECK; - clearPalette(); - bibleQuote(); - _cmp(data.byte(kQuitrequested), 0); - if (!flags.z()) - return /* (titlesearly) */; - intro(); -} - void DreamGenContext::endGame() { STACK_CHECK; dx = 1146; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 9dbb041998..a080410e6e 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -580,7 +580,6 @@ public: void openSarters(); void putUnderCentre(); void checkObjectSize(); - void titles(); void deallocateMem(); void showGroup(); void watchReel(); @@ -601,7 +600,6 @@ public: void introMonks1(); void resetLocation(); void introMonks2(); - void advisor(); void additionalText(); void useElevator5(); void useElevator4(); @@ -685,7 +683,7 @@ public: void lockLightOff(); void wearWatch(); void runIntroSeq(); - void nextColon(); + void advisor(); void attendant(); void nextSymbol(); void monks2text(); @@ -695,6 +693,7 @@ public: void openHotelDoor(); void blank(); void drinker(); + void nextColon(); void placeFreeObject(); void allPalette(); void adjustRight(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index b50710c10c..939b358404 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -542,7 +542,12 @@ void DreamGenContext::dreamweb() { if (startNewGame) { // "playGame" - titles(); + // "titles" + clearPalette(); + bibleQuote(); + if (!quitRequested()) // "titlesearly" + intro(); + if (quitRequested()) goto done; |