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

[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:
a192f58539 DREAMWEB: 'examIcon' ported to C++


Commit: a192f5853921367d489b69c2a59fea1694269f16
    https://github.com/scummvm/scummvm/commit/a192f5853921367d489b69c2a59fea1694269f16
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T08:08:00-08:00

Commit Message:
DREAMWEB: 'examIcon' 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 4b7e28c..8d95609 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -211,6 +211,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'entersymbol',
 	'eraseoldobs',
 	'error',
+	'examicon',
 	'examineob',
 	'examineobtext',
 	'facerightway',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c72bd02..43d5fd2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2926,16 +2926,6 @@ void DreamGenContext::openOb() {
 	cs.word(bx) = ax;
 }
 
-void DreamGenContext::examIcon() {
-	STACK_CHECK;
-	ds = data.word(kIcons2);
-	di = 254;
-	bx = 5;
-	al = 3;
-	ah = 0;
-	showFrame();
-}
-
 void DreamGenContext::describeOb() {
 	STACK_CHECK;
 	getObTextStart();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2328c3b..9117c93 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -831,7 +831,6 @@ public:
 	void deleteExText();
 	void foghornSound();
 	void liftNoise();
-	void examIcon();
 	void showGun();
 	void louisChair();
 	void locationPic();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3205ee8..754d4af 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2825,6 +2825,10 @@ void DreamGenContext::panelIcons1() {
 	showWatch();
 }
 
+void DreamGenContext::examIcon() {
+	showFrame(icons2(), 254, 5, 3, 0);
+}
+
 uint8 DreamGenContext::getLocation(uint8 index) {
 	return data.byte(kRoomscango + index);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6a728d9..99ef27b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -409,6 +409,7 @@
 	void showExit();
 	void showMan();
 	void panelIcons1();
+	void examIcon();
 	void buttonOne();
 	void buttonTwo();
 	void buttonThree();