6 files changed, 17 insertions, 22 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 37f3bb4769..2f58475398 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -274,6 +274,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'examineobtext',
 	'facerightway',
 	'fadecalculation',
+	'fadedos',
 	'fadescreenup',
 	'fadescreenups',
 	'fadescreenuphalf',
@@ -707,7 +708,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'openfilefromc' : 'openFileFromC',
 	'gettime' : 'getTime',
 	'loadtraveltext' : 'loadTravelText',
-	'fadedos' : 'fadeDOS',
 	'drawfloor' : 'drawFloor',
 	'loadkeypad' : 'loadKeypad',
 	'findtext1' : 'findText1',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 8aab18d49d..5e5f94c88a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -561,7 +561,6 @@ public:
 	void watchReel();
 	void openFileFromC();
 	void getTime();
-	void fadeDOS();
 	void findText1();
 	void isRyanHolding();
 	void showSlots();
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 619efa24f0..3151a5963d 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -327,24 +327,6 @@ void DreamWebEngine::mouseCall(uint16 *x, uint16 *y, uint16 *state) {
 	_oldMouseState = newState;
 }
 
-void DreamWebEngine::fadeDos() {
-	_context.ds = _context.es = _context.data.word(DreamGen::kBuffers);
-	return; //fixme later
-	waitForVSync();
-	//processEvents will be called from vsync
-	uint8 *dst = _context.es.ptr(DreamGen::kStartpal, 768);
-	getPalette(dst, 0, 64);
-	for(int fade = 0; fade < 64; ++fade) {
-		for(int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
-			if (dst[c]) {
-				--dst[c];
-			}
-		}
-		setPalette(dst, 0, 64);
-		waitForVSync();
-	}
-}
-
 void DreamWebEngine::getPalette(uint8 *data, uint start, uint count) {
 	_system->getPaletteManager()->grabPalette(data, start, count);
 	while(count--)
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 37db99b648..4b5e43ceab 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -101,7 +101,6 @@ public:
 
 	void mouseCall(uint16 *x, uint16 *y, uint16 *state); //fill mouse pos and button state
 	void processEvents();
-	void fadeDos();
 	void blit(const uint8 *src, int pitch, int x, int y, int w, int h);
 	void cls();
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5f8ff8c811..f6d3225edc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1118,7 +1118,21 @@ void DreamGenContext::showGroup() {
 }
 
 void DreamGenContext::fadeDOS() {
-	engine->fadeDos();
+	ds = es = data.word(kBuffers);
+	return; //fixme later
+	engine->waitForVSync();
+	//processEvents will be called from vsync
+	uint8 *dst = es.ptr(kStartpal, 768);
+	engine->getPalette(dst, 0, 64);
+	for(int fade = 0; fade < 64; ++fade) {
+		for(int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
+			if (dst[c]) {
+				--dst[c];
+			}
+		}
+		engine->setPalette(dst, 0, 64);
+		engine->waitForVSync();
+	}
 }
 
 void DreamGenContext::eraseOldObs() {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 56e54e2f49..e896acdd98 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -563,5 +563,6 @@
 	void dumpSymbol();
 	void dumpSymBox();
 	void dumpZoom();
+	void fadeDOS();
 
 #endif