aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdevtools/tasmrecover/tasm-recover1
-rw-r--r--engines/dreamweb/dreamgen.cpp10
-rw-r--r--engines/dreamweb/dreamgen.h5
-rw-r--r--engines/dreamweb/stubs.cpp5
-rw-r--r--engines/dreamweb/stubs.h1
5 files changed, 9 insertions, 13 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index fbd6b134a8..a879f8d39c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -407,6 +407,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'showcity',
'showcurrentfile',
'showdiscops',
+ 'showexit',
'showfirstuse',
'showfolder',
'showframe',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index aa2c3b96dd..b23ad9824d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10892,16 +10892,6 @@ void DreamGenContext::showMan() {
showFrame();
}
-void DreamGenContext::showExit() {
- STACK_CHECK;
- ds = data.word(kIcons1);
- di = 274;
- bx = 154;
- al = 11;
- ah = 0;
- showFrame();
-}
-
void DreamGenContext::panelIcons1() {
STACK_CHECK;
di = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 952ebfc865..33f2bdd30c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -710,7 +710,7 @@ public:
void findInvPos();
void workoutFrames();
void dumpSymBox();
- void dumpSymbol();
+ void rollEndCredits();
void intro2Text();
void interviewer();
void getKeyAndLogo();
@@ -734,7 +734,7 @@ public:
void showDiaryPage();
void useShield();
void getBackToOps();
- void rollEndCredits();
+ void dumpSymbol();
void intro1Text();
void transferToEx();
void reExFromInv();
@@ -880,7 +880,6 @@ public:
void showPuzText();
void incRyanPage();
void useElevator3();
- void showExit();
void findExObject();
void clearChanges();
void useChurchHole();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dd1f777cda..ec6223981c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2798,6 +2798,11 @@ void DreamGenContext::showRightPage() {
data.word(kLinespacing) = 10;
}
+void DreamGenContext::showExit() {
+ const Frame *frame = (const Frame *)getSegment(data.word(kIcons1)).ptr(0, 0);
+ showFrame(frame, 274, 154, 11, 0);
+}
+
uint8 DreamGenContext::getLocation(uint8 index) {
return data.byte(kRoomscango + index);
}
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index d540279a8d..619d26b861 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -404,6 +404,7 @@
void singleKey(uint8 key, uint16 x, uint16 y);
void showKeypad();
void showOuterPad();
+ void showExit();
void buttonOne();
void buttonTwo();
void buttonThree();