From 36278dccded41106e242b28810b13a5d702cc72a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 14 Nov 2011 20:18:06 +0100
Subject: DREAMWEB: Move 'mainscreen' from dreamgen

---
 devtools/tasmrecover/tasm-recover |  1 +
 engines/dreamweb/dreamgen.cpp     | 16 ----------------
 engines/dreamweb/stubs.cpp        | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 7fc9e526e9..ba631a81ac 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -216,6 +216,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'savegame',
 	'zoomonoff',
 	'inventory',
+	'mainscreen',
 	'doload'
 	])
 generator.generate('dreamweb') #start routine
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a2c83f04f1..24968bd628 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14008,22 +14008,6 @@ notzeronum:
 	ch = 1;
 }
 
-void DreamGenContext::mainscreen() {
-	STACK_CHECK;
-	data.byte(kInmaparea) = 0;
-	bx = offset_mainlist;
-	_cmp(data.byte(kWatchon), 1);
-	if (flags.z())
-		goto checkmain;
-	bx = offset_mainlist2;
-checkmain:
-	checkcoords();
-	_cmp(data.byte(kWalkandexam), 0);
-	if (flags.z())
-		return /* (finishmain) */;
-	walkandexamine();
-}
-
 void DreamGenContext::madmanrun() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 14);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5fa6e8af6d..fed7a39863 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1918,5 +1918,22 @@ void DreamGenContext::showcity() {
 	showframe(tempGraphics, 120+57, 32, 1, 0);
 }
 
+void DreamGenContext::mainscreen() {
+	STACK_CHECK;
+	data.byte(kInmaparea) = 0;
+	bx = offset_mainlist;
+	_cmp(data.byte(kWatchon), 1);
+	if (flags.z())
+		goto checkmain;
+	bx = offset_mainlist2;
+checkmain:
+	checkcoords();
+	_cmp(data.byte(kWalkandexam), 0);
+	if (flags.z())
+		return /* (finishmain) */;
+	walkandexamine();
+}
+
+
 } /*namespace dreamgen */
 
-- 
cgit v1.2.3