diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/parallaction/font.cpp | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/parallaction/font.cpp')
| -rw-r--r-- | engines/parallaction/font.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index 56c26b7b4f..13e94a4cda 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -408,7 +408,7 @@ void AmigaFont::drawString(byte *buffer, uint32 pitch, const char *s) { } -Font *DosDisk::createFont(const char *name, Cnv* cnv) { +Font *DosDisk_ns::createFont(const char *name, Cnv* cnv) { Font *f = 0; if (!scumm_stricmp(name, "comic")) @@ -425,7 +425,7 @@ Font *DosDisk::createFont(const char *name, Cnv* cnv) { return f; } -Font *AmigaDisk::createFont(const char *name, Common::SeekableReadStream &stream) { +Font *AmigaDisk_ns::createFont(const char *name, Common::SeekableReadStream &stream) { // TODO: implement AmigaLabelFont for labels return new AmigaFont(stream); } |