[Scummvm-cvs-logs] scummvm master -> aa3ab32f52fb0060285d12bb99e7ef733df8582a

tramboi bertrand_augereau at yahoo.fr
Wed Nov 16 19:19:56 CET 2011


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:
aa3ab32f52 DREAMWEB: 'zoomicon' ported to C++


Commit: aa3ab32f52fb0060285d12bb99e7ef733df8582a
    https://github.com/scummvm/scummvm/commit/aa3ab32f52fb0060285d12bb99e7ef733df8582a
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-16T12:16:13-08:00

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

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 7aea2fc..aa4958a 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -220,6 +220,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'paltoendpal',
 	'fadecalculation',
 	'watchcount',
+	'zoomicon',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 35f0f63..474da2b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14299,19 +14299,6 @@ zoomisoff:
 	showwatch();
 }
 
-void DreamGenContext::zoomicon() {
-	STACK_CHECK;
-	_cmp(data.byte(kZoomon), 0);
-	if (flags.z())
-		return /* (nozoom1) */;
-	ds = data.word(kIcons1);
-	di = (8);
-	bx = (132)-1;
-	al = 8;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::worktoscreenm() {
 	STACK_CHECK;
 	animpointer();
@@ -16509,7 +16496,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_showexit: showexit(); break;
 		case addr_panelicons1: panelicons1(); break;
 		case addr_gettime: gettime(); break;
-		case addr_zoomicon: zoomicon(); break;
 		case addr_worktoscreenm: worktoscreenm(); break;
 		case addr_blank: blank(); break;
 		case addr_allpointer: allpointer(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 94299c7..0dcc69f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -87,7 +87,6 @@ public:
 	static const uint16 addr_allpointer = 0xcaa4;
 	static const uint16 addr_blank = 0xcaa0;
 	static const uint16 addr_worktoscreenm = 0xca9c;
-	static const uint16 addr_zoomicon = 0xca90;
 	static const uint16 addr_gettime = 0xca8c;
 	static const uint16 addr_panelicons1 = 0xca84;
 	static const uint16 addr_showexit = 0xca80;
@@ -1787,7 +1786,7 @@ public:
 	void restorereels();
 	void setwalk();
 	//void useroutine();
-	void zoomicon();
+	//void zoomicon();
 	//void findlen();
 	void findpathofpoint();
 	void issetobonmap();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 338e8da..d25d11e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1990,5 +1990,11 @@ void DreamGenContext::roomname() {
 	usecharset1();
 }
 
+void DreamGenContext::zoomicon() {
+	if (data.byte(kZoomon) == 0)
+		return;
+	showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), kZoomx, kZoomy-1, 8, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3170be9..f0d8f40 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -266,5 +266,5 @@
 	void paltoendpal();
 	void fadecalculation();
 	void watchcount();
-
+	void zoomicon();
 






More information about the Scummvm-git-logs mailing list