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

[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:
a22266d871 DREAMWEB: Port 'runendseq' to C++ and remove the unused 'drawitall' function


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

Commit Message:
DREAMWEB: Port 'runendseq' to C++ and remove the unused 'drawitall' function

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 a4397a0..11754d2 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -337,6 +337,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'doshake',
 	'drawflags',
 	'drawfloor',
+	'drawitall',
 	'drinker',
 	'droperror',
 	'drunk',
@@ -658,6 +659,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'rollendcredits',
 	'rollendcredits2',
 	'roomname',
+	'runendseq',
 	'runtap',
 	'runintroseq',
 	'saveems',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1593ae7..d3e3ace 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -864,28 +864,6 @@ void DreamGenContext::initialMonCols() {
 	showGroup();
 }
 
-void DreamGenContext::runEndSeq() {
-	STACK_CHECK;
-	atmospheres();
-	data.byte(kGetback) = 0;
-moreendseq:
-	vSync();
-	spriteUpdate();
-	vSync();
-	delEverything();
-	printSprites();
-	reelsOnScreen();
-	afterIntroRoom();
-	useTimedText();
-	vSync();
-	dumpMap();
-	dumpTimedText();
-	vSync();
-	_cmp(data.byte(kGetback), 1);
-	if (!flags.z())
-		goto moreendseq;
-}
-
 void DreamGenContext::fillOpen() {
 	STACK_CHECK;
 	delTextLine();
@@ -3475,14 +3453,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::drawItAll() {
-	STACK_CHECK;
-	createPanel();
-	drawFloor();
-	printSprites();
-	showIcon();
-}
-
 void DreamGenContext::useCashCard() {
 	STACK_CHECK;
 	getRidOfReels();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index bde9149..ddddf79 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -483,8 +483,8 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
+	void fadeDownMon();
 	void identifyOb();
-	void runEndSeq();
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
@@ -497,7 +497,6 @@ public:
 	void getOpenedSize();
 	void adjustUp();
 	void fadeScreenDownHalf();
-	void fadeDownMon();
 	void outOfOpen();
 	void dirCom();
 	void endGameSeq();
@@ -547,7 +546,6 @@ public:
 	void setPickup();
 	void dropObject();
 	void openOb();
-	void drawItAll();
 	void useStereo();
 	void showDiaryKeys();
 	void useOpened();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e753efd..51884ac 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4627,4 +4627,24 @@ void DreamGenContext::dumpDiaryKeys() {
 	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
 }
 
+void DreamGenContext::runEndSeq() {
+	atmospheres();
+	data.byte(kGetback) = 0;
+
+	do {
+		vSync();
+		spriteUpdate();
+		vSync();
+		delEverything();
+		printSprites();
+		reelsOnScreen();
+		afterIntroRoom();
+		useTimedText();
+		vSync();
+		dumpMap();
+		dumpTimedText();
+		vSync();
+	} while (data.byte(kGetback) != 1);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f7d8086..24f92a9 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -584,5 +584,6 @@
 	void updateSymbolBot();
 	void showDiaryPage();
 	void dumpDiaryKeys();
+	void runEndSeq();
 
 #endif