DREAMWEB: 'showMenu' ported to C++

scummvm · Dec 3, 2011 · a92a441 · a92a441
1 parent 47ffd3f
commit a92a441
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 deletions.
diff --git 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
@@ -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
@@ -651,7 +651,7 @@ class DreamGenContext : public Context {
 	void femaleFan();
 	void identifyOb();
 	void useLighter();
-	void showMenu();
+	void runEndSeq();
 	void usePoolReader();
 	void useOpenBox();
 	void clearBuffers();
@@ -676,7 +676,6 @@ class DreamGenContext : public Context {
 	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
@@ -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
@@ -304,6 +304,7 @@
 	void fadeupMonFirst();
 	void printLogo();
 	void loadMenu();
+	void showMenu();
 	void useMenu();
 	void useMon();
 	void scrollMonitor();