From 3fee10eb604d31aa731362404fc7eaa080032642 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 Apr 2011 23:02:07 +1000
Subject: TSAGE: Cleaner bugfix for text colours being incorrect

---
 engines/tsage/converse.cpp | 1 -
 engines/tsage/core.cpp     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 18ba28da63..57c5c48975 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -791,7 +791,6 @@ Speaker::Speaker() : EventHandler() {
 	_fontNumber = 2;
 	_textMode = ALIGN_LEFT;
 	_color1 = _color2 = _color3 = _globals->_scenePalette._colors.foreground;
-	_color2 = _color3 = 0;
 	_action = NULL;
 	_speakerName = "SPEAKER";
 }
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index d064917c36..1b38599df1 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1300,7 +1300,7 @@ uint8 ScenePalette::indexOf(uint r, uint g, uint b, int threshold) {
 		int bDiff = abs(ib - (int)b);
 
 		int idxThreshold = rDiff * rDiff + gDiff * gDiff + bDiff * bDiff;
-		if (idxThreshold <= threshold) {
+		if (idxThreshold < threshold) {
 			threshold = idxThreshold;
 			palIndex = i;
 		}
-- 
cgit v1.2.3