diff options
| author | Einar Johan Trøan Sømåen | 2012-07-29 00:27:50 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-29 00:27:50 +0200 |
| commit | 6dc1e09da93c0ba0507fd0ceadbbb504469deccc (patch) | |
| tree | dae477f4ed7c6b9be7a5dd38174d81cdbae48c58 /engines/wintermute/base/font/base_font_truetype.cpp | |
| parent | e841bf16d6b955f779e5e30535848bd650d22352 (diff) | |
| download | scummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.tar.gz scummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.tar.bz2 scummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.zip | |
WINTERMUTE: Replace const char* with const Common::String & in fonts, gfx, particles, sound and files.
Diffstat (limited to 'engines/wintermute/base/font/base_font_truetype.cpp')
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 2dd436dc37..793c044839 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -292,19 +292,19 @@ int BaseFontTT::getLetterHeight() { //////////////////////////////////////////////////////////////////////
-bool BaseFontTT::loadFile(const char *filename) {
+bool BaseFontTT::loadFile(const Common::String &filename) {
byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
if (buffer == NULL) {
- _gameRef->LOG(0, "BaseFontTT::LoadFile failed for file '%s'", filename);
+ _gameRef->LOG(0, "BaseFontTT::LoadFile failed for file '%s'", filename.c_str());
return STATUS_FAILED;
}
bool ret;
- setFilename(filename);
+ setFilename(filename.c_str());
if (DID_FAIL(ret = loadBuffer(buffer))) {
- _gameRef->LOG(0, "Error parsing TTFONT file '%s'", filename);
+ _gameRef->LOG(0, "Error parsing TTFONT file '%s'", filename.c_str());
}
delete[] buffer;
|