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_sub_frame.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_sub_frame.cpp')
| -rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 17b5196f2a..6ce8c78b3b 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -594,7 +594,7 @@ const char *BaseSubFrame::scToString() { //////////////////////////////////////////////////////////////////////////
-bool BaseSubFrame::setSurface(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
+bool BaseSubFrame::setSurface(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
if (_surface) {
_gameRef->_surfaceStorage->removeSurface(_surface);
_surface = NULL;
@@ -605,8 +605,8 @@ bool BaseSubFrame::setSurface(const char *filename, bool defaultCK, byte ckRed, _surface = _gameRef->_surfaceStorage->addSurface(filename, defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
if (_surface) {
- _surfaceFilename = new char[strlen(filename) + 1];
- strcpy(_surfaceFilename, filename);
+ _surfaceFilename = new char[filename.size() + 1];
+ strcpy(_surfaceFilename, filename.c_str());
_cKDefault = defaultCK;
_cKRed = ckRed;
|