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

[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:
d41d7e5f36 DREAMWEB: Clean up the palette brightness code


Commit: d41d7e5f3688b3d83323d9240fe744ba8d339307
    https://github.com/scummvm/scummvm/commit/d41d7e5f3688b3d83323d9240fe744ba8d339307
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-03-03T15:11:50-08:00

Commit Message:
DREAMWEB: Clean up the palette brightness code

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



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 9c02cd7..af55d0c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -89,7 +89,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_speechCount = 0;
 	_charShift = 0;
 	_kerning = 0;
-	_brightness = 0;
+	_brightPalette = false;
 	_roomLoaded = 0;
 	_didZoom = 0;
 	_lineSpacing = 10;
@@ -366,7 +366,9 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
+	ConfMan.registerDefault("bright_palette", true);
 	_hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
+	_brightPalette = ConfMan.getBool("bright_palette");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index e80b553..13a2744 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -341,7 +341,7 @@ public:
 	uint8 _speechCount;
 	uint16 _charShift;
 	uint8 _kerning;
-	uint8 _brightness;
+	bool _brightPalette;
 	uint8 _roomLoaded;
 	uint8 _didZoom;
 	uint16 _lineSpacing;
@@ -952,7 +952,6 @@ public:
 	void screenUpdate();
 	void startup1();
 	void readOneBlock();
-	void seeCommandTail();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8e63774..9789e20 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -565,7 +565,6 @@ void DreamWebEngine::dreamweb() {
 		break;
 	}
 
-	seeCommandTail();
 	allocateBuffers();
 
 	// setMouse
@@ -877,10 +876,6 @@ void DreamWebEngine::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamWebEngine::seeCommandTail() {
-	_brightness = 1;
-}
-
 void DreamWebEngine::readMouse() {
 	_oldButton = _mouseButton;
 	uint16 state = readMouseState();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index be7d210..a66f156 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -417,7 +417,7 @@ void DreamWebEngine::loadPalFromIFF() {
 	uint8 *dst = _mainPal;
 	for (size_t i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
-		if (_brightness == 1) {
+		if (_brightPalette) {
 			if (c) {
 				c = c + c / 2 + c / 4;
 				if (c > 63)