diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/agi/text.cpp | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/agi/text.cpp')
| -rw-r--r-- | engines/agi/text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp index eb48857bf2..16c8284ce0 100644 --- a/engines/agi/text.cpp +++ b/engines/agi/text.cpp @@ -50,7 +50,7 @@ void AgiEngine::printText2(int l, const char *msg, int foff, int xoff, int yoff, // FR: strings with len == 1 were not printed if (len == 1) { - _gfx->putTextCharacter(l, xoff + foff, yoff, *msg, fg, bg, checkerboard); + _gfx->putTextCharacter(l, xoff + foff, yoff, *msg, fg, bg, checkerboard, _fontData); maxx = 1; minx = 0; ofoff = foff; @@ -74,7 +74,7 @@ void AgiEngine::printText2(int l, const char *msg, int foff, int xoff, int yoff, if (xpos >= GFX_WIDTH) continue; - _gfx->putTextCharacter(l, xpos, ypos, *m, fg, bg, checkerboard); + _gfx->putTextCharacter(l, xpos, ypos, *m, fg, bg, checkerboard, _fontData); if (x1 > maxx) maxx = x1; |