[Scummvm-cvs-logs] scummvm master -> 6f8a4bb336e3a881fabe7eb857a227a6dcd3d026

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6f8a4bb336 DREAMWEB: Ported 'searchforfiles' to C++


Commit: 6f8a4bb336e3a881fabe7eb857a227a6dcd3d026
    https://github.com/scummvm/scummvm/commit/6f8a4bb336e3a881fabe7eb857a227a6dcd3d026
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-25T21:46:01-08:00

Commit Message:
DREAMWEB: Ported 'searchforfiles' to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/monitor.cpp
    engines/dreamweb/stubs.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a076c9e..e7c7cf2 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -767,6 +767,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'scanfornames',
 	'screenupdate',
 	'scrollmonitor',
+	'searchforfiles',
 	'searchforsame',
 	'security',
 	'seecommandtail',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6c16274..66885d7 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -384,22 +384,6 @@ dirroot:
 	scrollMonitor();
 }
 
-void DreamGenContext::searchForFiles() {
-	STACK_CHECK;
-	bx = (66*2);
-directloop1:
-	al = es.byte(bx);
-	_inc(bx);
-	_cmp(al, '*');
-	if (flags.z())
-		return /* (endofdir) */;
-	_cmp(al, 34);
-	if (!flags.z())
-		goto directloop1;
-	monPrint();
-	goto directloop1;
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6c5bf19..3d98f29 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -465,7 +465,6 @@ public:
 	void dreamweb();
 	void read();
 	void searchForString();
-	void searchForFiles();
 	void getExAd();
 	void transferToEx();
 	void parser();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 4627597..f3aad7a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -514,4 +514,17 @@ void DreamGenContext::signOn() {
 	}
 }
 
+void DreamGenContext::searchForFiles() {
+	bx = kTextstart;
+
+	while (true) {
+		al = es.byte(bx);
+		bx++;
+		if (al == '*')
+			return; // "endofdir"
+		if (al == 34)
+			monPrint();
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2ed08f9..7301ba9 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -143,5 +143,6 @@
 	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
+	void searchForFiles();
 
 #endif