DREAMWEB: 'loadroom' ported to C++

scummvm · Nov 16, 2011 · 63a88bb · 63a88bb
1 parent aa3ab32
commit 63a88bb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
@@ -221,6 +221,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'fadecalculation',
 	'watchcount',
 	'zoomicon',
+	'loadroom',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
@@ -14510,26 +14510,6 @@ void DreamGenContext::loadtemptext() {
 	data.word(kTextfile1) = ax;
 }
 
-void DreamGenContext::loadroom() {
-	STACK_CHECK;
-	data.byte(kRoomloaded) = 1;
-	data.word(kTimecount) = 0;
-	data.word(kMaintimer) = 0;
-	data.word(kMapoffsetx) = 104;
-	data.word(kMapoffsety) = 38;
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
-	al = data.byte(kNewlocation);
-	data.byte(kLocation) = al;
-	getroomdata();
-	startloading();
-	loadroomssample();
-	switchryanon();
-	drawflags();
-	getdimension();
-}
-
 void DreamGenContext::loadroomssample() {
 	STACK_CHECK;
 	al = data.byte(kRoomssample);
@@ -16517,7 +16497,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_loadtempcharset: loadtempcharset(); break;
 		case addr_standardload: standardload(); break;
 		case addr_loadtemptext: loadtemptext(); break;
-		case addr_loadroom: loadroom(); break;
 		case addr_loadroomssample: loadroomssample(); break;
 		case addr_getridofreels: getridofreels(); break;
 		case addr_getridofall: getridofall(); break;

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
@@ -65,7 +65,6 @@ class DreamGenContext : public Context {
 	static const uint16 addr_getridofall = 0xcb3c;
 	static const uint16 addr_getridofreels = 0xcb38;
 	static const uint16 addr_loadroomssample = 0xcb34;
-	static const uint16 addr_loadroom = 0xcb30;
 	static const uint16 addr_loadtemptext = 0xcb2c;
 	static const uint16 addr_standardload = 0xcb28;
 	static const uint16 addr_loadtempcharset = 0xcb24;
@@ -1382,7 +1381,7 @@ class DreamGenContext : public Context {
 	void manasleep2();
 	void moretalk();
 	//void printslow();
-	void loadroom();
+	//void loadroom();
 	void starttalk();
 	void delchar();
 	void getanyad();

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -1996,5 +1996,23 @@ void DreamGenContext::zoomicon() {
 	showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), kZoomx, kZoomy-1, 8, 0);
 }
 
+void DreamGenContext::loadroom() {
+	data.byte(kRoomloaded) = 1;
+	data.word(kTimecount) = 0;
+	data.word(kMaintimer) = 0;
+	data.word(kMapoffsetx) = 104;
+	data.word(kMapoffsety) = 38;
+	data.word(kTextaddressx) = 13;
+	data.word(kTextaddressy) = 182;
+	data.byte(kTextlen) = 240;
+	data.byte(kLocation) = data.byte(kNewlocation);
+	getroomdata();
+	startloading();
+	loadroomssample();
+	switchryanon();
+	drawflags();
+	getdimension();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -267,4 +267,6 @@
 	void fadecalculation();
 	void watchcount();
 	void zoomicon();
+	void loadroom();
+