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

[bluegr]

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:
b02a957f77 DREAMWEB: 'examineinventory' ported to C++


Commit: b02a957f77373f78151707ec45fefe95e4555282
    https://github.com/scummvm/scummvm/commit/b02a957f77373f78151707ec45fefe95e4555282
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-07T14:57:14-08:00

Commit Message:
DREAMWEB: 'examineinventory' 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 3fb7dfa..ae0d401 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -286,6 +286,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'errormessage2',
 	'errormessage3',
 	'examicon',
+	'examineinventory',
 	'examineob',
 	'examineobtext',
 	'facerightway',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index aaa531f..9653063 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2006,32 +2006,6 @@ pickupexob:
 	workToScreenM();
 }
 
-void DreamGenContext::examineInventory() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 249);
-	if (flags.z())
-		goto alreadyexinv;
-	data.byte(kCommandtype) = 249;
-	al = 32;
-	commandOnly();
-alreadyexinv:
-	ax = data.word(kMousebutton);
-	_and(ax, 1);
-	if (!flags.z())
-		goto doexinv;
-	return;
-doexinv:
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	examIcon();
-	data.byte(kPickup) = 0;
-	data.byte(kInvopen) = 2;
-	openInv();
-	workToScreenM();
-}
-
 void DreamGenContext::reExFromInv() {
 	STACK_CHECK;
 	findInvPos();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ca9f561..fe922cd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -627,7 +627,6 @@ public:
 	void showDiaryPage();
 	void transferToEx();
 	void reExFromInv();
-	void examineInventory();
 	void businessMan();
 	void outOfInv();
 	void diaryKeyP();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e75c7cd..637df60 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3872,4 +3872,25 @@ void DreamGenContext::selectLocation() {
 	deallocateMem(data.word(kTraveltext));
 }
 
+
+void DreamGenContext::examineInventory() {
+	if (data.byte(kCommandtype) != 249) {
+		data.byte(kCommandtype) = 249;
+		commandOnly(32);
+	}
+
+	if (!(data.word(kMousebutton) & 1))
+		return;
+
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	examIcon();
+	data.byte(kPickup) = 0;
+	data.byte(kInvopen) = 2;
+	openInv();
+	workToScreenM();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2699605..73fa7a6 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -583,5 +583,6 @@
 	void closeFile();
 	void getTime();
 	void set16ColPalette();
+	void examineInventory();
 
 #endif