DREAMWEB: 'showfirstuse' ported to C++

scummvm · Nov 26, 2011 · 86c9fda · 86c9fda
1 parent ce47764
commit 86c9fda
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
@@ -286,6 +286,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usetempcharset',
 	'disablepath',
 	'getbackfromob',
+	'showfirstuse',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
@@ -8287,16 +8287,6 @@ void DreamGenContext::useelevator1() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::showfirstuse() {
-	STACK_CHECK;
-	getobtextstart();
-	findnextcolon();
-	findnextcolon();
-	usetext();
-	cx = 400;
-	hangonp();
-}
-
 void DreamGenContext::useelevator3() {
 	STACK_CHECK;
 	showfirstuse();

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
@@ -253,7 +253,6 @@ class DreamGenContext : public Context {
 	static const uint16 addr_useelevator2 = 0xc69c;
 	static const uint16 addr_useelevator4 = 0xc698;
 	static const uint16 addr_useelevator3 = 0xc694;
-	static const uint16 addr_showfirstuse = 0xc690;
 	static const uint16 addr_useelevator1 = 0xc68c;
 	static const uint16 addr_usehandle = 0xc688;
 	static const uint16 addr_usewire = 0xc684;
@@ -1168,7 +1167,6 @@ class DreamGenContext : public Context {
 	void clearbuffers();
 	//void neterror();
 	void storeit();
-	//void lockeddoorway();
 	//void isitworn();
 	//void putundertimed();
 	//void dumpmap();
@@ -1520,6 +1518,7 @@ class DreamGenContext : public Context {
 	void random();
 	void mainman();
 	void mansatstill();
+	//void showfirstuse();
 	void channel1only();
 	//void checkbasemem();
 	void lastfolder();
@@ -1839,7 +1838,7 @@ class DreamGenContext : public Context {
 	void usewinch();
 	void setbotright();
 	//void readmouse3();
-	void showfirstuse();
+	//void lockeddoorway();
 	void setupemm();
 	void aide();
 	//void getmapad();

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -340,4 +340,5 @@
 	void usetempcharset();
 	void usecharset1();
 	void getbackfromob();
+	void showfirstuse();
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
@@ -177,5 +177,13 @@ void DreamGenContext::usetext(const uint8 *string) {
 	worktoscreenm();
 }
 
+void DreamGenContext::showfirstuse() {
+	uint8 *obText = getobtextstartCPP();
+	findnextcolon(&obText);
+	findnextcolon(&obText);
+	usetext(obText);
+	hangonp(400);
+}
+
 } /*namespace dreamgen */