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/base_surface_storage.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/base_surface_storage.cpp')
| -rw-r--r-- | engines/wintermute/base/base_surface_storage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp index c01c86c009..7d6f499012 100644 --- a/engines/wintermute/base/base_surface_storage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -100,17 +100,17 @@ bool BaseSurfaceStorage::removeSurface(BaseSurface *surface) { //////////////////////////////////////////////////////////////////////
-BaseSurface *BaseSurfaceStorage::addSurface(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
+BaseSurface *BaseSurfaceStorage::addSurface(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
for (uint32 i = 0; i < _surfaces.size(); i++) {
- if (scumm_stricmp(_surfaces[i]->getFileName(), filename) == 0) {
+ if (scumm_stricmp(_surfaces[i]->getFileName(), filename.c_str()) == 0) {
_surfaces[i]->_referenceCount++;
return _surfaces[i];
}
}
if (!_gameRef->_fileManager->hasFile(filename)) {
- if (filename) {
- _gameRef->LOG(0, "Missing image: '%s'", filename);
+ if (filename.size()) {
+ _gameRef->LOG(0, "Missing image: '%s'", filename.c_str());
}
if (_gameRef->_debugDebugMode) {
return addSurface("invalid_debug.bmp", defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
|