[Scummvm-cvs-logs] scummvm master -> 6e90f9e6938c9727a3dbb552b74f0d40d0ab221f

[tramboi]

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:
6e90f9e693 DREAMWEB: 'clearendpal' ported to C++


Commit: 6e90f9e6938c9727a3dbb552b74f0d40d0ab221f
    https://github.com/scummvm/scummvm/commit/6e90f9e6938c9727a3dbb552b74f0d40d0ab221f
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-16T08:56:06-08:00

Commit Message:
DREAMWEB: 'clearendpal' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 972d00e..b4c5f35 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -213,6 +213,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'initrain',
 	'checkbasemem',
 	'clearstartpal',
+	'clearendpal',
 	'paltostartpal',
 	'endpaltostart',
 	'startpaltoend',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6c605e6..4d71850 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2560,15 +2560,6 @@ void DreamGenContext::dofade() {
 	fadecalculation();
 }
 
-void DreamGenContext::clearendpal() {
-	STACK_CHECK;
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
-	cx = 768;
-	al = 0;
-	_stosb(cx, true);
-}
-
 void DreamGenContext::clearpalette() {
 	STACK_CHECK;
 	data.byte(kFadedirection) = 0;
@@ -16137,7 +16128,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_transfermap: transfermap(); break;
 		case addr_fadedos: fadedos(); break;
 		case addr_dofade: dofade(); break;
-		case addr_clearendpal: clearendpal(); break;
 		case addr_clearpalette: clearpalette(); break;
 		case addr_fadescreenup: fadescreenup(); break;
 		case addr_fadetowhite: fadetowhite(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 564b52e..7bdb934 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -514,7 +514,6 @@ public:
 	static const uint16 addr_fadetowhite = 0xc25c;
 	static const uint16 addr_fadescreenup = 0xc258;
 	static const uint16 addr_clearpalette = 0xc254;
-	static const uint16 addr_clearendpal = 0xc250;
 	static const uint16 addr_dofade = 0xc24c;
 	static const uint16 addr_fadedos = 0xc248;
 	static const uint16 addr_transfermap = 0xc244;
@@ -1291,7 +1290,7 @@ public:
 	void drawfloor();
 	void loadkeypad();
 	//void findsource();
-	void clearendpal();
+	//void clearendpal();
 	void findtext1();
 	void isryanholding();
 	void showslots();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2fcb914..a9c8941 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -259,6 +259,7 @@
 	uint8 *startPalette();
 	uint8 *endPalette();
 	void clearstartpal();
+	void clearendpal();
 	void paltostartpal();
 	void endpaltostart();
 	void startpaltoend();
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index abb1a9b..10857d2 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -40,6 +40,10 @@ void DreamGenContext::clearstartpal() {
 	memset(startPalette(), 0, 256*3);
 }
 
+void DreamGenContext::clearendpal() {
+	memset(endPalette(), 0, 256*3);
+}
+
 void DreamGenContext::paltostartpal() {
 	memcpy(startPalette(), mainPalette(), 256*3);
 }