DREAMWEB: 'startup' and 'startup1' ported to C++

4 files changed, 38 insertions, 42 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b788ba8c69..617590b006 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12458,42 +12458,6 @@ void DreamGenContext::clearrest() {
 	deallocatemem();
 }
 
-void DreamGenContext::startup() {
-	STACK_CHECK;
-	data.byte(kCurrentkey) = 0;
-	data.byte(kMainmode) = 0;
-	createpanel();
-	data.byte(kNewobs) = 1;
-	drawfloor();
-	showicon();
-	getunderzoom();
-	spriteupdate();
-	printsprites();
-	undertextline();
-	reelsonscreen();
-	atmospheres();
-}
-
-void DreamGenContext::startup1() {
-	STACK_CHECK;
-	clearpalette();
-	data.byte(kThroughdoor) = 0;
-	data.byte(kCurrentkey) = '0';
-	data.byte(kMainmode) = 0;
-	createpanel();
-	data.byte(kNewobs) = 1;
-	drawfloor();
-	showicon();
-	getunderzoom();
-	spriteupdate();
-	printsprites();
-	undertextline();
-	reelsonscreen();
-	atmospheres();
-	worktoscreen();
-	fadescreenup();
-}
-
 void DreamGenContext::screenupdate() {
 	STACK_CHECK;
 	newplace();
@@ -15335,8 +15299,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_clearrest: clearrest(); break;
 		case addr_deallocatemem: deallocatemem(); break;
 		case addr_allocatemem: allocatemem(); break;
-		case addr_startup: startup(); break;
-		case addr_startup1: startup1(); break;
 		case addr_screenupdate: screenupdate(); break;
 		case addr_watchreel: watchreel(); break;
 		case addr_checkforshake: checkforshake(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index c5e24b5d95..90f84e1927 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -104,8 +104,6 @@ public:
 	static const uint16 addr_checkforshake = 0xc9a4;
 	static const uint16 addr_watchreel = 0xc9a0;
 	static const uint16 addr_screenupdate = 0xc99c;
-	static const uint16 addr_startup1 = 0xc998;
-	static const uint16 addr_startup = 0xc994;
 	static const uint16 addr_allocatemem = 0xc988;
 	static const uint16 addr_deallocatemem = 0xc984;
 	static const uint16 addr_clearrest = 0xc980;
@@ -1591,7 +1589,7 @@ public:
 	void rollem();
 	//void makeworn();
 	void hangonpq();
-	void startup();
+	//void startup();
 	void savegame();
 	//void startpaltoend();
 	//void showicon();
@@ -1767,7 +1765,7 @@ public:
 	//void hangon();
 	//void loadpalfromiff();
 	//void facerightway();
-	void startup1();
+	//void startup1();
 	void hotelcontrol();
 	void mugger();
 	void atmospheres();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f0f6877cff..75c1fb55b7 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -203,6 +203,40 @@ void DreamGenContext::dreamweb() {
 	}
 }
 
+void DreamGenContext::startup() {
+	data.byte(kCurrentkey) = 0;
+	data.byte(kMainmode) = 0;
+	createpanel();
+	data.byte(kNewobs) = 1;
+	drawfloor();
+	showicon();
+	getunderzoom();
+	spriteupdate();
+	printsprites();
+	undertextline();
+	reelsonscreen();
+	atmospheres();
+}
+
+void DreamGenContext::startup1() {
+	clearpalette();
+	data.byte(kThroughdoor) = 0;
+	data.byte(kCurrentkey) = '0';
+	data.byte(kMainmode) = 0;
+	createpanel();
+	data.byte(kNewobs) = 1;
+	drawfloor();
+	showicon();
+	getunderzoom();
+	spriteupdate();
+	printsprites();
+	undertextline();
+	reelsonscreen();
+	atmospheres();
+	worktoscreen();
+	fadescreenup();
+}
+
 static Common::String getFilename(Context &context) {
 	const char *name = (const char *)context.cs.ptr(context.dx, 0);
 	return Common::String(name);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index eaa27e8b5f..68f0776f7f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
+	void startup();
+	void startup1();
 	uint16 allocatemem(uint16 paragraphs);
 	void deallocatemem(uint16 segment);
 	uint8 *workspace();