DREAMWEB: Move fadeDOS to vgafades.cpp, cleanup

scummvm · Dec 12, 2011 · 571fcfe · 571fcfe
1 parent ea941af
commit 571fcfe
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
@@ -152,6 +152,7 @@ class DreamBase : public SegmentManager {
 	void endPalToStart();
 	void startPalToEnd();
 	void palToEndPal();
+	void fadeDOS();
 	void doFade();
 	void fadeCalculation();
 	void fadeScreenUp();

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -1008,25 +1008,6 @@ void DreamGenContext::showGroup() {
 	cx = 0;
 }
 
-void DreamGenContext::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() {
 	if (data.byte(kNewobs) == 0)
 		return;

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -527,7 +527,6 @@
 	void dumpSymbol();
 	void dumpSymBox();
 	void dumpZoom();
-	void fadeDOS();
 	void selectLocation();
 	void showGroup();
 	void loadSpeech();

diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
@@ -60,6 +60,24 @@ void DreamBase::palToEndPal() {
 	memcpy(endPalette(), mainPalette(), 256 * 3);
 }
 
+void DreamBase::fadeDOS() {
+	return; // FIXME later
+
+	engine->waitForVSync();
+	//processEvents will be called from vsync
+	uint8 *dst = startPalette();
+	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 DreamBase::doFade() {
 	if (data.byte(kFadedirection) == 0)
 		return;

diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
@@ -202,7 +202,7 @@ void DreamBase::showPCX(const Common::String &name) {
 	// the color components have to be adjusted from 8 to 6 bits.
 
 	pcxFile.seek(16, SEEK_SET);
-	mainGamePal = getSegment(data.word(kBuffers)).ptr(kMaingamepal, 768);
+	mainGamePal = mainPalette();
 	pcxFile.read(mainGamePal, 48);
 
 	memset(mainGamePal + 48, 0xff, 720);