DREAMWEB: 'folderhints' ported to C++

4 files changed, 25 insertions, 54 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d435f5a73d..753e15148b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9740,57 +9740,6 @@ void DreamGenContext::loadmenu() {
 	loadintotemp2();
 }
 
-void DreamGenContext::folderhints() {
-	STACK_CHECK;
-	_cmp(data.byte(kFolderpage), 5);
-	if (!flags.z())
-		goto notaideadd;
-	_cmp(data.byte(kAidedead), 1);
-	if (flags.z())
-		goto notaideadd;
-	al = 13;
-	getlocation();
-	_cmp(al, 1);
-	if (flags.z())
-		goto notaideadd;
-	al = 13;
-	setlocation();
-	showfolder();
-	al = 30;
-	findtext1();
-	di = 0;
-	bx = 86;
-	dl = 141;
-	ah = 16;
-	printdirect();
-	worktoscreenm();
-	cx = 200;
-	hangonp();
-	return;
-notaideadd:
-	_cmp(data.byte(kFolderpage), 9);
-	if (!flags.z())
-		return /* (notaristoadd) */;
-	al = 7;
-	getlocation();
-	_cmp(al, 1);
-	if (flags.z())
-		return /* (notaristoadd) */;
-	al = 7;
-	setlocation();
-	showfolder();
-	al = 31;
-	findtext1();
-	di = 0;
-	bx = 86;
-	dl = 141;
-	ah = 16;
-	printdirect();
-	worktoscreenm();
-	cx = 200;
-	hangonp();
-}
-
 void DreamGenContext::loadfolder() {
 	STACK_CHECK;
 	dx = 2299;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 36e2254e54..13841c8cc0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -178,7 +178,6 @@ public:
 	static const uint16 addr_entersymbol = 0xc7d8;
 	static const uint16 addr_folderexit = 0xc7cc;
 	static const uint16 addr_loadfolder = 0xc7c4;
-	static const uint16 addr_folderhints = 0xc7bc;
 	static const uint16 addr_loadmenu = 0xc7b0;
 	static const uint16 addr_showmenu = 0xc7ac;
 	static const uint16 addr_dumpmenu = 0xc79c;
@@ -1319,7 +1318,7 @@ public:
 	void openpoolboss();
 	void buttontwo();
 	//void delsprite();
-	//void getroomspaths();
+	//void folderhints();
 	//void dumptextline();
 	void fadescreendownhalf();
 	void useplate();
@@ -1397,7 +1396,7 @@ public:
 	//void calcmapad();
 	void getridofall();
 	void copper();
-	void folderhints();
+	//void getroomspaths();
 	void openhoteldoor();
 	//void removesetobject();
 	//void dumptimedtext();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 81d284cd38..e6a32132d7 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2463,5 +2463,27 @@ void DreamGenContext::lastfolder() {
 	}
 }
 
+void DreamGenContext::folderhints() {
+	if (data.byte(kFolderpage) == 5) {
+		if ((data.byte(kAidedead) != 1) && (getlocation(13) != 1)) {
+			setlocation(13);
+			showfolder();
+			const uint8 *string = getTextInFile1(30);
+			printdirect(string, 0, 86, 141, true);
+			worktoscreenm();
+			hangonp(200);
+		}
+	} else if (data.byte(kFolderpage) == 9) {
+		if (getlocation(7) != 1) {
+			setlocation(7);
+			showfolder();
+			const uint8 *string = getTextInFile1(31);
+			printdirect(string, 0, 86, 141, true);
+			worktoscreenm();
+			hangonp(200);
+		}
+	}
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2a6175b135..f175d52a47 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -361,6 +361,7 @@
 	void showrightpage();
 	void nextfolder();
 	void lastfolder();
+	void folderhints();
 	uint8 getlocation(uint8 index);
 	void getlocation();
 	void setlocation(uint8 index);