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

[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:
f1a099d4f8 DREAMWEB: Port 'lookatcard' to C++


Commit: f1a099d4f8ba4cd2efc58c24f7075f77c7459016
    https://github.com/scummvm/scummvm/commit/f1a099d4f8ba4cd2efc58c24f7075f77c7459016
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-13T16:17:53-08:00

Commit Message:
DREAMWEB: Port 'lookatcard' 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 11754d2..03e831f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -515,6 +515,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'locklighton',
 	'lockmon',
 	'look',
+	'lookatcard',
 	'loopchannel0',
 	'louis',
 	'louischair',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d3e3ace..e8e577e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3510,57 +3510,6 @@ _tmp1:
 	putBackObStuff();
 }
 
-void DreamGenContext::lookAtCard() {
-	STACK_CHECK;
-	data.byte(kManisoffscreen) = 1;
-	getRidOfReels();
-	loadKeypad();
-	createPanel2();
-	di = 160;
-	bx = 80;
-	ds = data.word(kTempgraphics);
-	al = 42;
-	ah = 128;
-	showFrame();
-	getObTextStart();
-	findNextColon();
-	findNextColon();
-	findNextColon();
-	di = 36;
-	bx = 124;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	push(es);
-	push(si);
-	workToScreenM();
-	cx = 280;
-	hangOnW();
-	createPanel2();
-	di = 160;
-	bx = 80;
-	ds = data.word(kTempgraphics);
-	al = 42;
-	ah = 128;
-	showFrame();
-	si = pop();
-	es = pop();
-	di = 36;
-	bx = 130;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	workToScreenM();
-	cx = 200;
-	hangOnW();
-	data.byte(kManisoffscreen) = 0;
-	getRidOfTemp();
-	restoreReels();
-	putBackObStuff();
-}
-
 void DreamGenContext::moneyPoke() {
 	STACK_CHECK;
 	bx = offset_money1poke;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ddddf79..43f93ee 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -489,7 +489,7 @@ public:
 	void getObTextStart();
 	void checkObjectSize();
 	void isRyanHolding();
-	void showSlots();
+	void fillOpen();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -537,10 +537,9 @@ public:
 	void poolGuard();
 	void lookAtPlace();
 	void findAllOpen();
-	void fillOpen();
+	void showSlots();
 	void findSetObject();
 	void deleteExObject();
-	void lookAtCard();
 	void helicopter();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 51884ac..127724f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4647,4 +4647,34 @@ void DreamGenContext::runEndSeq() {
 	} while (data.byte(kGetback) != 1);
 }
 
+void DreamGenContext::lookAtCard() {
+	//showFrame((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
+	//al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
+	data.byte(kManisoffscreen) = 1;
+	getRidOfReels();
+	loadKeypad();
+	createPanel2();
+	showFrame(tempGraphics(), 160, 80, 42, 128);
+	uint8 *obText = getObTextStartCPP();
+	findNextColon(&obText);
+	findNextColon(&obText);
+	findNextColon(&obText);
+	printDirect(obText, 36, 124, 241, 241 & 1);
+	push(es);
+	push(si);
+	workToScreenM();
+	hangOnW(280);
+	createPanel2();
+	showFrame(tempGraphics(), 160, 80, 42, 128);
+	si = pop();
+	es = pop();
+	printDirect(obText, 36, 130, 241, 241 & 1);
+	workToScreenM();
+	hangOnW(200);
+	data.byte(kManisoffscreen) = 0;
+	getRidOfTemp();
+	restoreReels();
+	putBackObStuff();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 24f92a9..e60a569 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -585,5 +585,6 @@
 	void showDiaryPage();
 	void dumpDiaryKeys();
 	void runEndSeq();
+	void lookAtCard();
 
 #endif