aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
authorMax Horn2003-04-27 18:49:27 +0000
committerMax Horn2003-04-27 18:49:27 +0000
commit30ac620bd3d26304f109bdb7190cc8c120716df4 (patch)
tree876e1b3c015c1ca6ab2312b997c11165cac89381 /scumm/string.cpp
parent732d457aac9eefcdc1adb4b3b5ee5a6a2e7ea4a1 (diff)
downloadscummvm-rg350-30ac620bd3d26304f109bdb7190cc8c120716df4.tar.gz
scummvm-rg350-30ac620bd3d26304f109bdb7190cc8c120716df4.tar.bz2
scummvm-rg350-30ac620bd3d26304f109bdb7190cc8c120716df4.zip
drop shadow cleanup
svn-id: r7163
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index adfd538cfc..671b64833d 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -143,7 +143,7 @@ void Scumm::CHARSET_1() {
_charset->_center = _string[0].center;
_charset->_right = _string[0].right;
- _charset->_color = _charsetColor;
+ _charset->setColor(_charsetColor);
if (!(_features & GF_AFTER_V3)) // FIXME
for (i = 0; i < 4; i++)
@@ -301,9 +301,9 @@ void Scumm::CHARSET_1() {
color = *buffer++;
color |= *buffer++ << 8;
if (color == 0xFF)
- _charset->_color = _charsetColor;
+ _charset->setColor(_charsetColor);
else
- _charset->_color = color;
+ _charset->setColor(color);
break;
case 13:
buffer += 2;
@@ -356,7 +356,7 @@ void Scumm::drawDescString(byte *msg) {
_charset->_startLeft = _charset->_left = _string[0].xpos;
_charset->_right = _realWidth - 1;
_charset->_center = _string[0].center;
- _charset->_color = _string[0].color;
+ _charset->setColor(_string[0].color);
_charset->_disableOffsX = _charset->_firstChar = true;
_charset->setCurID(_string[0].charset);
_charset->_nextLeft = _string[0].xpos;
@@ -410,7 +410,7 @@ void Scumm::drawString(int a) {
_charset->_startLeft = _charset->_left = _string[a].xpos;
_charset->_right = _string[a].right;
_charset->_center = _string[a].center;
- _charset->_color = _string[a].color;
+ _charset->setColor(_string[a].color);
_charset->_disableOffsX = _charset->_firstChar = true;
_charset->setCurID(_string[a].charset);
@@ -479,9 +479,9 @@ void Scumm::drawString(int a) {
color = buf[i] + (buf[i + 1] << 8);
i += 2;
if (color == 0xFF)
- _charset->_color = _string[a].color;
+ _charset->setColor(_string[a].color);
else
- _charset->_color = color;
+ _charset->setColor(color);
break;
}
} else {