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

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


Commit: c98803817418c39ca94994e7946419645ab729dd
    https://github.com/scummvm/scummvm/commit/c98803817418c39ca94994e7946419645ab729dd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-13T14:47:29-08:00

Commit Message:
DREAMWEB: Port 'showdiarypage' 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 42f6e27..b989217 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -698,6 +698,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showcurrentfile',
 	'showdecisions',
 	'showdiary',
+	'showdiarypage',
 	'showdiscops',
 	'showexit',
 	'showfirstuse',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 83b86f9..725e682 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4260,39 +4260,6 @@ notdumpdiary:
 	multiDump();
 }
 
-void DreamGenContext::showDiaryPage() {
-	STACK_CHECK;
-	al = 0;
-	ah = 0;
-	di = (68+24);
-	bx = (48+12);
-	ds = data.word(kTempgraphics);
-	showFrame();
-	al = data.byte(kDiarypage);
-	findText1();
-	data.byte(kKerning) = 1;
-	useTempCharset();
-	di = (68+24)+48;
-	bx = (48+12)+16;
-	dl = 240;
-	ah = 16;
-	data.word(kCharshift) = 91+91;
-	printDirect();
-	di = (68+24)+129;
-	bx = (48+12)+16;
-	dl = 240;
-	ah = 16;
-	printDirect();
-	di = (68+24)+48;
-	bx = (48+12)+23;
-	dl = 240;
-	ah = 16;
-	printDirect();
-	data.byte(kKerning) = 0;
-	data.word(kCharshift) = 0;
-	useCharset1();
-}
-
 void DreamGenContext::findText1() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a8e8a61..f5c333b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -523,7 +523,6 @@ public:
 	void getKeyAndLogo();
 	void selectOb();
 	void fadeUpMon();
-	void showDiaryPage();
 	void reExFromInv();
 	void businessMan();
 	void outOfInv();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a7d6584..4fc46ad 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4582,4 +4582,21 @@ void DreamGenContext::updateSymbolBot() {
 	}
 }
 
+void DreamGenContext::showDiaryPage() {
+	showFrame(tempGraphics(), kDiaryx, kDiaryy, 0, 0);
+	data.byte(kKerning) = 1;
+	useTempCharset();
+	data.word(kCharshift) = 91+91;
+	uint16 offset = kTextstart + getSegment(data.word(kTextfile1)).word(data.byte(kDiarypage) * 2);
+	const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
+	uint16 y = kDiaryy + 16;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
+	y = kDiaryy + 23;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	data.byte(kKerning) = 0;
+	data.word(kCharshift) = 0;
+	useCharset1();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5256111..da01c9b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -581,5 +581,6 @@
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
+	void showDiaryPage();
 
 #endif