aboutsummaryrefslogtreecommitdiff
path: root/scumm/nut_renderer.cpp
diff options
context:
space:
mode:
authorMax Horn2004-06-27 21:52:25 +0000
committerMax Horn2004-06-27 21:52:25 +0000
commitdf984b3824c596c7f7e6a12e33bbbe0b2b470586 (patch)
treed477d1a4d47ace1604a477a9bfb308632ffecdda /scumm/nut_renderer.cpp
parenta1b82d8e13ca41834c494839c2a05ae7638a38c3 (diff)
downloadscummvm-rg350-df984b3824c596c7f7e6a12e33bbbe0b2b470586.tar.gz
scummvm-rg350-df984b3824c596c7f7e6a12e33bbbe0b2b470586.tar.bz2
scummvm-rg350-df984b3824c596c7f7e6a12e33bbbe0b2b470586.zip
Thanks to File::setDefaultDirectory(), in most cases it is *not* necessary to pass getGameDataPath() on to File::open()
svn-id: r14087
Diffstat (limited to 'scumm/nut_renderer.cpp')
-rw-r--r--scumm/nut_renderer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index d99d61f1a0..5bf36d1e12 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -113,16 +113,16 @@ static int32 codec1(byte *dst, byte *src, int height) {
return decoded_length;
}
-bool NutRenderer::loadFont(const char *filename, const char *directory) {
- debug(8, "NutRenderer::loadFont(\"%s\", \"%s\") called", filename, directory);
+bool NutRenderer::loadFont(const char *filename) {
+ debug(8, "NutRenderer::loadFont(\"%s\") called", filename);
if (_loaded) {
warning("NutRenderer::loadFont() Font already loaded, ok, loading...");
}
File file;
- file.open(filename, directory);
+ file.open(filename);
if (file.isOpen() == false) {
- warning("NutRenderer::loadFont() Can't open font file: %s/%s", directory, filename);
+ warning("NutRenderer::loadFont() Can't open font file: %s", filename);
return false;
}
@@ -183,11 +183,11 @@ bool NutRenderer::loadFont(const char *filename, const char *directory) {
_chars[l].width--;
}
} else {
- warning("NutRenderer::loadFont(%s, %s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, directory, l, offset);
+ warning("NutRenderer::loadFont(%s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, l, offset);
break;
}
} else {
- warning("NutRenderer::loadFont(%s, %s) there is no FRME chunk %d (offset %x)", filename, directory, l, offset);
+ warning("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
break;
}
}