[Scummvm-cvs-logs] scummvm master -> 7e4a261609a4f38053d61f9717f57f91e180d2f1

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


Commit: 7e4a261609a4f38053d61f9717f57f91e180d2f1
    https://github.com/scummvm/scummvm/commit/7e4a261609a4f38053d61f9717f57f91e180d2f1
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-08T02:37:24-08:00

Commit Message:
DREAMWEB: Port 'showdiary' to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 6cdec7c..a37f7a7 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -587,6 +587,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showbyte',
 	'showcity',
 	'showcurrentfile',
+	'showdiary',
 	'showdiscops',
 	'showexit',
 	'showfirstuse',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3849e46..7672290 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -91,6 +91,7 @@ public:
 	void showArrows();
 	void showOpBox();
 	void middlePanel();
+	void showDiary();
 
 	// from vgafades.cpp
 	uint8 *mainPalette();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index fed9eef..718538e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5857,22 +5857,6 @@ diaryloop:
 	workToScreenM();
 }
 
-void DreamGenContext::showDiary() {
-	STACK_CHECK;
-	al = 1;
-	ah = 0;
-	di = (68+24);
-	bx = (48+12)+37;
-	ds = data.word(kTempgraphics);
-	showFrame();
-	al = 2;
-	ah = 0;
-	di = (68+24)+176;
-	bx = (48+12)+108;
-	ds = data.word(kTempgraphics);
-	showFrame();
-}
-
 void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 56c7aa6..9d283b2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -571,7 +571,6 @@ public:
 	void fadeDownMon();
 	void printmessage2();
 	void bartender();
-	void showDiary();
 	void outOfOpen();
 	void dirCom();
 	void endGameSeq();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a4c02e8..6ad048d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3810,4 +3810,9 @@ void DreamBase::middlePanel() {
 	showFrame(tempSprites, 160 + 71, 21, 47, 4);
 }
 
+void DreamBase::showDiary() {
+	showFrame(tempGraphics(), kDiaryx, kDiaryy + 37, 1, 0);
+	showFrame(tempGraphics(), kDiaryx + 176, kDiaryy + 108, 2, 0);
+}
+
 } // End of namespace DreamGen