[Scummvm-cvs-logs] scummvm master -> 3ff9b7f9edf6e57705147537863eb2e4728b8642

bluegr md5 at scummvm.org
Mon Dec 12 03:23:27 CET 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
571fcfe15d DREAMWEB: Move fadeDOS to vgafades.cpp, cleanup
3ff9b7f9ed DREAMWEB: Fix typo in monkSpeaking()


Commit: 571fcfe15db35335df9c304f74b55751278931a4
    https://github.com/scummvm/scummvm/commit/571fcfe15db35335df9c304f74b55751278931a4
Author: Max Horn (max at quendi.de)
Date: 2011-12-11T18:20:27-08:00

Commit Message:
DREAMWEB: Move fadeDOS to vgafades.cpp, cleanup

Changed paths:
    engines/dreamweb/dreambase.h
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h
    engines/dreamweb/vgafades.cpp
    engines/dreamweb/vgagrafx.cpp



diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 38665a0..b22f46b 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -152,6 +152,7 @@ public:
 	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
index 89d5336..4b692f8 100644
--- 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
index 36328f5..49f319b 100644
--- 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
index d44f827..ceb4178 100644
--- 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
index 12feb56..c7d17c1 100644
--- 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);


Commit: 3ff9b7f9edf6e57705147537863eb2e4728b8642
    https://github.com/scummvm/scummvm/commit/3ff9b7f9edf6e57705147537863eb2e4728b8642
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-11T18:22:49-08:00

Commit Message:
DREAMWEB: Fix typo in monkSpeaking()

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4b692f8..02381cc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4253,7 +4253,7 @@ void DreamGenContext::monkSpeaking() {
 	hangOn(300);
 	al = 40;
 
-	for (int i = 40; i < 48; i++) {
+	for (int i = 40; i <= 48; i++) {
 		dl = 'T';
 		dh = 83;
 		cl = 'T';






More information about the Scummvm-git-logs mailing list