From 76cf7bc907f7d8dafaddd01a42c843c6a06cd5f2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 May 2011 14:41:49 +0200
Subject: SCI: Slight cleanup to undithering code

---
 engines/sci/graphics/screen.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/sci/graphics/screen.cpp')

diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index f619780c7c..aa4ee0b638 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -111,7 +111,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 
 	_picNotValid = 0;
 	_picNotValidSci11 = 0;
-	_unditherState = true;
+	_unditheringEnabled = true;
 	_fontIsUpscaled = false;
 
 	if (_resMan->getViewType() != kViewEga) {
@@ -560,7 +560,7 @@ void GfxScreen::dither(bool addToFlag) {
 	byte *visualPtr = _visualScreen;
 	byte *displayPtr = _displayScreen;
 
-	if (!_unditherState) {
+	if (!_unditheringEnabled) {
 		// Do dithering on visual and display-screen
 		for (y = 0; y < _height; y++) {
 			for (x = 0; x < _width; x++) {
@@ -624,12 +624,12 @@ void GfxScreen::ditherForceDitheredColor(byte color) {
 	_ditheredPicColors[color] = 256;
 }
 
-void GfxScreen::debugUnditherSetState(bool flag) {
-	_unditherState = flag;
+void GfxScreen::enableUndithering(bool flag) {
+	_unditheringEnabled = flag;
 }
 
 int16 *GfxScreen::unditherGetDitheredBgColors() {
-	if (_unditherState)
+	if (_unditheringEnabled)
 		return (int16 *)&_ditheredPicColors;
 	else
 		return NULL;
-- 
cgit v1.2.3


From 389b613190f14c7462043b75e84217633141149b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 May 2011 14:42:45 +0200
Subject: SCI: Fix warning about potential strict-aliasing rules violation

---
 engines/sci/graphics/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/graphics/screen.cpp')

diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index aa4ee0b638..56e6759fac 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -630,7 +630,7 @@ void GfxScreen::enableUndithering(bool flag) {
 
 int16 *GfxScreen::unditherGetDitheredBgColors() {
 	if (_unditheringEnabled)
-		return (int16 *)&_ditheredPicColors;
+		return _ditheredPicColors;
 	else
 		return NULL;
 }
-- 
cgit v1.2.3