diff options
| author | johndoe123 | 2013-04-18 19:08:22 +0200 |
|---|---|---|
| committer | johndoe123 | 2013-04-18 19:08:22 +0200 |
| commit | 176a3babc553d1d6eb2a57fddb0a9665fc4aaa71 (patch) | |
| tree | 239f044793de424c8ca50e739beab44b122609c6 /engines/wintermute/base/base_string_table.cpp | |
| parent | e935f85366ba1e83fdd1cea3712959edee1f6270 (diff) | |
| parent | 6c55213cd5a63ff198a25573ad38672e7faa02ce (diff) | |
| download | scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.gz scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.bz2 scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into sword25-gfx
Diffstat (limited to 'engines/wintermute/base/base_string_table.cpp')
| -rw-r--r-- | engines/wintermute/base/base_string_table.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp index 11ec7b094f..8207c32244 100644 --- a/engines/wintermute/base/base_string_table.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -29,6 +29,7 @@ #include "engines/wintermute/platform_osystem.h" #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/base/base_string_table.h" #include "common/str.h" @@ -64,7 +65,7 @@ bool BaseStringTable::addString(const char *key, const char *val, bool reportDup StringsIter it = _strings.find(finalKey); if (it != _strings.end() && reportDuplicities) { - _gameRef->LOG(0, " Warning: Duplicate definition of string '%s'.", finalKey.c_str()); + BaseEngine::LOG(0, " Warning: Duplicate definition of string '%s'.", finalKey.c_str()); } _strings[finalKey] = val; @@ -185,7 +186,7 @@ const char *BaseStringTable::expandStatic(const char *string) const { ////////////////////////////////////////////////////////////////////////// bool BaseStringTable::loadFile(const char *filename, bool clearOld) { - _gameRef->LOG(0, "Loading string table..."); + BaseEngine::LOG(0, "Loading string table..."); if (clearOld) { _strings.clear(); @@ -194,7 +195,7 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { uint32 size; byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename, &size); if (buffer == nullptr) { - _gameRef->LOG(0, "BaseStringTable::LoadFile failed for file '%s'", filename); + BaseEngine::LOG(0, "BaseStringTable::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -205,7 +206,7 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { if (_gameRef->_textEncoding != TEXT_UTF8) { _gameRef->_textEncoding = TEXT_UTF8; //_gameRef->_textEncoding = TEXT_ANSI; - _gameRef->LOG(0, " UTF8 file detected, switching to UTF8 text encoding"); + BaseEngine::LOG(0, " UTF8 file detected, switching to UTF8 text encoding"); } } else { _gameRef->_textEncoding = TEXT_ANSI; @@ -247,7 +248,7 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { delete[] buffer; - _gameRef->LOG(0, " %d strings loaded", _strings.size()); + BaseEngine::LOG(0, " %d strings loaded", _strings.size()); return STATUS_OK; } |