[Scummvm-cvs-logs] scummvm master -> 54fc8e55638c0b5c3198cb785825106a79bc4978

[tramboi]

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:
54fc8e5563 DREAMWEB: 'reelsonscreen' ported to C++


Commit: 54fc8e55638c0b5c3198cb785825106a79bc4978
    https://github.com/scummvm/scummvm/commit/54fc8e55638c0b5c3198cb785825106a79bc4978
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-23T02:14:38-08:00

Commit Message:
DREAMWEB: 'reelsonscreen' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 101d277..8722a2d 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -271,6 +271,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'createpanel',
 	'createpanel2',
 	'findroominloc',
+	'reelsonscreen',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 36947ee..4ea1410 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2142,15 +2142,6 @@ gotconst:
 	ds.byte(di+17) = al;
 }
 
-void DreamGenContext::reelsonscreen() {
-	STACK_CHECK;
-	reconstruct();
-	updatepeople();
-	watchreel();
-	showrain();
-	usetimedtext();
-}
-
 void DreamGenContext::soundonreels() {
 	STACK_CHECK;
 	bl = data.byte(kReallocation);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a48ca27..c3ed363 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -476,7 +476,6 @@ public:
 	static const uint16 addr_deleverything = 0xc1c0;
 	static const uint16 addr_reconstruct = 0xc1ac;
 	static const uint16 addr_soundonreels = 0xc1a8;
-	static const uint16 addr_reelsonscreen = 0xc1a0;
 	static const uint16 addr_constant = 0xc184;
 	static const uint16 addr_steady = 0xc180;
 	static const uint16 addr_random = 0xc17c;
@@ -1183,6 +1182,7 @@ public:
 	void clearbuffers();
 	//void neterror();
 	void storeit();
+	//void lockeddoorway();
 	//void isitworn();
 	//void putundertimed();
 	//void dumpmap();
@@ -1196,7 +1196,7 @@ public:
 	void loadfolder();
 	void dumpdiarykeys();
 	//void dumppointer();
-	void reelsonscreen();
+	void bossman();
 	void getridofreels();
 	void readkey();
 	void louis();
@@ -1466,6 +1466,7 @@ public:
 	//void showcity();
 	void dumpsymbol();
 	void disablepath();
+	//void convicons();
 	void buttonsix();
 	void intro2text();
 	void showouterpad();
@@ -1550,7 +1551,6 @@ public:
 	void purgealocation();
 	void sparkydrip();
 	//void paltostartpal();
-	void bossman();
 	void getridofpit();
 	void convnum();
 	//void checkifset();
@@ -1772,6 +1772,7 @@ public:
 	void usegun();
 	void autoappear();
 	//void findnextcolon();
+	//void reelsonscreen();
 	//void readmouse4();
 	void openryan();
 	void callhotellift();
@@ -1837,14 +1838,12 @@ public:
 	void usechurchgate();
 	void monkandryan();
 	void allocatebuffers();
-	//void convicons();
 	void swapwithinv();
 	void usecontrol();
 	void buttonseven();
 	void redrawmainscrn();
 	void showgroup();
 	//void findallryan();
-	//void lockeddoorway();
 	//void channel0tran();
 	void buttonpress();
 	//void parseblaster();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 06b6739..9e6d9d2 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1012,5 +1012,13 @@ void DreamGenContext::textformonk() {
 	setuptimedtemp();
 }
 
+void DreamGenContext::reelsonscreen() {
+	reconstruct();
+	updatepeople();
+	watchreel();
+	showrain();
+	usetimedtext();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f30b13b..18a513b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -330,4 +330,5 @@
 	void createpanel();
 	void createpanel2();
 	void findroominloc();
+	void reelsonscreen();