aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdevtools/tasmrecover/tasm-recover1
-rw-r--r--engines/dreamweb/dreamgen.cpp17
-rw-r--r--engines/dreamweb/dreamgen.h3
-rw-r--r--engines/dreamweb/stubs.cpp7
-rw-r--r--engines/dreamweb/stubs.h1
5 files changed, 10 insertions, 19 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 9d0added80..187e4d6015 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -255,6 +255,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'loadroomssample',
'printlogo',
'loadmenu',
+ 'showmenu',
'usemenu',
'usemon',
'scrollmonitor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index fe10fc2d06..1dafee3ffa 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9170,23 +9170,6 @@ void DreamGenContext::dumpMenu() {
multiDump();
}
-void DreamGenContext::showMenu() {
- STACK_CHECK;
- _inc(data.byte(kMenucount));
- _cmp(data.byte(kMenucount), 37*2);
- if (!flags.z())
- goto menuframeok;
- data.byte(kMenucount) = 0;
-menuframeok:
- al = data.byte(kMenucount);
- _shr(al, 1);
- ah = 0;
- di = (80+40);
- bx = (60);
- ds = data.word(kTempgraphics);
- showFrame();
-}
-
void DreamGenContext::enterSymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 86aa288767..79af657ae0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -651,7 +651,7 @@ public:
void femaleFan();
void identifyOb();
void useLighter();
- void showMenu();
+ void runEndSeq();
void usePoolReader();
void useOpenBox();
void clearBuffers();
@@ -676,7 +676,6 @@ public:
void getTime();
void candles1();
void fadeDOS();
- void runEndSeq();
void loadKeypad();
void findText1();
void isRyanHolding();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8b284803d9..827f888c47 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2731,6 +2731,13 @@ void DreamGenContext::loadMenu() {
loadIntoTemp2("DREAMWEB.G07");
}
+void DreamGenContext::showMenu() {
+ ++data.byte(kMenucount);
+ if (data.byte(kMenucount) == 37*2)
+ data.byte(kMenucount) = 0;
+ showFrame(tempGraphics(), kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
+}
+
void DreamGenContext::useMenu() {
getRidOfReels();
loadMenu();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4b2ec565e8..ab597b1f7c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -304,6 +304,7 @@
void fadeupMonFirst();
void printLogo();
void loadMenu();
+ void showMenu();
void useMenu();
void useMon();
void scrollMonitor();