aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-07-15 22:22:39 +0000
committerTorbjörn Andersson2006-07-15 22:22:39 +0000
commit700953cff7b1615b5cc1b36d9db4bdf8b14d2d2d (patch)
treecf7cfb4819cbd947e9ddf2c543132e354165a03e /engines/sword2
parent68c150df3cb9b46f8505156be9a6b2663774dd60 (diff)
downloadscummvm-rg350-700953cff7b1615b5cc1b36d9db4bdf8b14d2d2d.tar.gz
scummvm-rg350-700953cff7b1615b5cc1b36d9db4bdf8b14d2d2d.tar.bz2
scummvm-rg350-700953cff7b1615b5cc1b36d9db4bdf8b14d2d2d.zip
Oops. I just noticed I was using _black to track the white colour, and _white
to track the black colour. svn-id: r23522
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/animation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index b677ccec5a..f13ce959c0 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -116,12 +116,12 @@ void MoviePlayer::updatePalette(byte *pal, bool packed) {
uint32 weight = 3 * r * r + 6 * g * g + 2 * b * b;
if (weight >= maxWeight) {
- _black = i;
+ _white = i;
maxWeight = weight;
}
if (weight <= minWeight) {
- _white = i;
+ _black = i;
minWeight = i;
}
@@ -232,9 +232,9 @@ void MoviePlayer::drawTextObject(MovieTextObject *t) {
for (int y = 0; y < t->textSprite->h; y++) {
for (int x = 0; x < t->textSprite->w; x++) {
if (src[x] == 1)
- dst[x] = _white;
- else if (src[x] == 255)
dst[x] = _black;
+ else if (src[x] == 255)
+ dst[x] = _white;
}
src += t->textSprite->w;
dst += screenWidth;