[Scummvm-cvs-logs] scummvm master -> 5cd7f3f82c8b6a4f43b7df3f2419077122e544c9

[tramboi]

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

Summary:
50fdbd34b8 DREAMWEB: 'waitframes' ported to C++
5cd7f3f82c DREAMWEB: Removed an useless stub ('kernchars')


Commit: 50fdbd34b831243166df98262cadad089e4c292b
    https://github.com/scummvm/scummvm/commit/50fdbd34b831243166df98262cadad089e4c292b
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-24T23:12:27-07:00

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

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 520419b..6596d4e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -160,6 +160,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'readmouse2',
 	'readmouse3',
 	'readmouse4',
+	'waitframes',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index aab3907..721ac52 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3926,26 +3926,6 @@ realcreditsearly:
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::waitframes() {
-	STACK_CHECK;
-	push(di);
-	push(bx);
-	push(es);
-	push(si);
-	push(ds);
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	delpointer();
-	ax = data.word(kMousebutton);
-	ds = pop();
-	si = pop();
-	es = pop();
-	bx = pop();
-	di = pop();
-}
-
 void DreamGenContext::monprint() {
 	STACK_CHECK;
 	data.byte(kKerning) = 1;
@@ -18109,7 +18089,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_mode640x480: mode640x480(); break;
 		case addr_set16colpalette: set16colpalette(); break;
 		case addr_realcredits: realcredits(); break;
-		case addr_waitframes: waitframes(); break;
 		case addr_monprint: monprint(); break;
 		case addr_fillryan: fillryan(); break;
 		case addr_fillopen: fillopen(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2af08a4..7fc3091 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -517,7 +517,6 @@ public:
 	static const uint16 addr_fillopen = 0xc324;
 	static const uint16 addr_fillryan = 0xc320;
 	static const uint16 addr_monprint = 0xc314;
-	static const uint16 addr_waitframes = 0xc308;
 	static const uint16 addr_realcredits = 0xc2f8;
 	static const uint16 addr_set16colpalette = 0xc2f4;
 	static const uint16 addr_mode640x480 = 0xc2f0;
@@ -1917,7 +1916,7 @@ public:
 	void searchforfiles();
 	void monkspeaking();
 	void fadecalculation();
-	void waitframes();
+	//void waitframes();
 	void clearrest();
 	//void getreelframeax();
 	void barwoman();
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 26084c3..844ad97 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -112,10 +112,10 @@ uint8 DreamGenContext::printslow(const uint8 *string, uint16 x, uint16 y, uint8
 				printboth(charSet, &offset2, y, c1, c2);
 				data.word(kCharshift) = 0;
 				for (int i=0; i<2; ++i) {
-					waitframes();
-					if (ax == 0)
+					uint16 mouseState = waitframes();
+					if (mouseState == 0)
 						continue;
-					if (ax != data.word(kOldbutton)) {
+					if (mouseState != data.word(kOldbutton)) {
 						return 1;
 					}
 				}
@@ -220,5 +220,14 @@ void DreamGenContext::kernchars() {
 	cl = kernchars(al, ah, cl);
 }
 
+uint16 DreamGenContext::waitframes() {
+	readmouse();
+	showpointer();
+	vsync();
+	dumppointer();
+	delpointer();
+	return data.word(kMousebutton);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index df64013..17ee0d8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -190,4 +190,5 @@
 	void readmouse2();
 	void readmouse3();
 	void readmouse4();
+	uint16 waitframes();
 


Commit: 5cd7f3f82c8b6a4f43b7df3f2419077122e544c9
    https://github.com/scummvm/scummvm/commit/5cd7f3f82c8b6a4f43b7df3f2419077122e544c9
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-24T23:13:40-07:00

Commit Message:
DREAMWEB: Removed an useless stub ('kernchars')

Changed paths:
    engines/dreamweb/print.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 844ad97..c1dbfc0 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -216,10 +216,6 @@ uint8 DreamGenContext::kernchars(uint8 firstChar, uint8 secondChar, uint8 width)
 	return width;
 }
 
-void DreamGenContext::kernchars() {
-	cl = kernchars(al, ah, cl);
-}
-
 uint16 DreamGenContext::waitframes() {
 	readmouse();
 	showpointer();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 17ee0d8..c1a9140 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -58,7 +58,6 @@
 	void dumptextline();
 	void getnumber();
 	uint8 getnumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
-	void kernchars();
 	uint8 kernchars(uint8 firstChar, uint8 secondChar, uint8 width);
 	void getroomdata();
 	void readheader();