aboutsummaryrefslogtreecommitdiff
path: root/engines/toltecs/screen.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2013-12-04 20:42:50 +0100
committerMartin Kiewitz2013-12-04 20:42:50 +0100
commiteaf6367bb26b95af7e27ebbbb090664a3ad04e65 (patch)
treef4acee388f2591f0cfa0848aa337f9cca5733c0d /engines/toltecs/screen.cpp
parent8bdffcb2fb7aefc96aa10fde1bebd372233cac9d (diff)
parent203f562d375ac5c7cc665c8feac4020f8de2a5ff (diff)
downloadscummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.gz
scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.bz2
scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.zip
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/toltecs/screen.cpp')
-rw-r--r--engines/toltecs/screen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp
index 1eb2f41fd2..dd418be71f 100644
--- a/engines/toltecs/screen.cpp
+++ b/engines/toltecs/screen.cpp
@@ -599,7 +599,7 @@ int16 Screen::drawString(int16 x, int16 y, byte color, uint fontResIndex, const
if (ywobble)
yadd = *ywobble;
- while (len--) {
+ while (len--) {
byte ch = *text++;
if (ch <= 0x20) {
x += font.getWidth();
@@ -634,7 +634,7 @@ void Screen::drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, b
byte flags = charData[0] & 0xF0;
charData++;
if ((flags & 0x80) == 0) {
- if (flags & 0x10) {
+ if (flags & 0x10) {
memset(dest, color, count);
} else if (outline) {
memset(dest, 0, count);