aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2011-04-20 23:02:07 +1000
committerPaul Gilbert2011-04-20 23:02:07 +1000
commit3fee10eb604d31aa731362404fc7eaa080032642 (patch)
tree69ce9ca4e56e8504b7f790dfb824823c9f5199a3 /engines
parent1eb75f789228f881c623d4ca72df4d5cba25ea68 (diff)
downloadscummvm-rg350-3fee10eb604d31aa731362404fc7eaa080032642.tar.gz
scummvm-rg350-3fee10eb604d31aa731362404fc7eaa080032642.tar.bz2
scummvm-rg350-3fee10eb604d31aa731362404fc7eaa080032642.zip
TSAGE: Cleaner bugfix for text colours being incorrect
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/converse.cpp1
-rw-r--r--engines/tsage/core.cpp2
2 files changed, 1 insertions, 2 deletions
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;
}