DREAMWEB: 'showseconduse' ported to C++

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

Hide file tree

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

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
@@ -7782,17 +7782,6 @@ void DreamGenContext::uselighter() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::showseconduse() {
-	STACK_CHECK;
-	getobtextstart();
-	nextcolon();
-	nextcolon();
-	nextcolon();
-	usetext();
-	cx = 400;
-	hangonp();
-}
-
 void DreamGenContext::usecardreader1() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
@@ -264,7 +264,6 @@ class DreamGenContext : public Context {
 	static const uint16 addr_usecardreader3 = 0xc66c;
 	static const uint16 addr_usecardreader2 = 0xc668;
 	static const uint16 addr_usecardreader1 = 0xc664;
-	static const uint16 addr_showseconduse = 0xc660;
 	static const uint16 addr_uselighter = 0xc65c;
 	static const uint16 addr_usepoolreader = 0xc658;
 	static const uint16 addr_calledensdlift = 0xc654;
@@ -1437,6 +1436,7 @@ class DreamGenContext : public Context {
 	void adjustright();
 	void putunderzoom();
 	void vsync();
+	//void showseconduse();
 	//void finishedwalking();
 	void findinvpos();
 	void dumpmenu();
@@ -1547,7 +1547,6 @@ class DreamGenContext : public Context {
 	//void getyad();
 	//void reconstruct();
 	void soldier1();
-	//void animpointer();
 	void getundercentre();
 	void checkforexit();
 	void loadseg();
@@ -1583,7 +1582,7 @@ class DreamGenContext : public Context {
 	void getback1();
 	void setlocation();
 	void fadefromwhite();
-	void checksoundint();
+	//void animpointer();
 	void usewindow();
 	void wearshades();
 	//void onedigit();
@@ -1851,7 +1850,7 @@ class DreamGenContext : public Context {
 	//void showryanpage();
 	//void printlogo();
 	void allpointer();
-	void showseconduse();
+	void checksoundint();
 	void clearreels();
 	void malefan();
 	void dosaveload();

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -341,4 +341,5 @@
 	void usecharset1();
 	void getbackfromob();
 	void showfirstuse();
+	void showseconduse();
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
@@ -185,5 +185,14 @@ void DreamGenContext::showfirstuse() {
 	hangonp(400);
 }
 
+void DreamGenContext::showseconduse() {
+	uint8 *obText = getobtextstartCPP();
+	findnextcolon(&obText);
+	findnextcolon(&obText);
+	findnextcolon(&obText);
+	usetext(obText);
+	hangonp(400);
+}
+
 } /*namespace dreamgen */