diff options
| author | Alyssa Milburn | 2012-08-25 00:08:13 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-25 08:41:22 +0200 |
| commit | ff9569572a3587b96b849fe4ef572ed91c7e6f5d (patch) | |
| tree | ec54bc682b90b29ed435b60d45243d18b9e895a2 /engines/tony/game.cpp | |
| parent | ba20f1d90dd21986f8eb250e93d794db87b9a51c (diff) | |
| download | scummvm-rg350-ff9569572a3587b96b849fe4ef572ed91c7e6f5d.tar.gz scummvm-rg350-ff9569572a3587b96b849fe4ef572ed91c7e6f5d.tar.bz2 scummvm-rg350-ff9569572a3587b96b849fe4ef572ed91c7e6f5d.zip | |
TONY: Store savegame names with Common::String.
Diffstat (limited to 'engines/tony/game.cpp')
| -rw-r--r-- | engines/tony/game.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp index b3b6fe2347..9b1d85f827 100644 --- a/engines/tony/game.cpp +++ b/engines/tony/game.cpp @@ -514,7 +514,7 @@ void RMOptionScreen::refreshAll(CORO_PARAM) { if (_statePos == 0 && _ctx->i == 0) s = "Autosave"; else - s = Common::String::format("%02d)%s", _statePos + _ctx->i, (const char *)_curThumbName[_ctx->i]); + s = Common::String::format("%02d)%s", _statePos + _ctx->i, _curThumbName[_ctx->i].c_str()); } _ctx->num[_ctx->i] = new RMText; @@ -558,7 +558,7 @@ void RMOptionScreen::refreshThumbnails() { if (!loadThumbnailFromSaveState(_statePos + i, *_curThumb[i], _curThumbName[i], _curThumbDiff[i])) { delete _curThumb[i]; _curThumb[i] = NULL; - _curThumbName[i] = ""; + _curThumbName[i].clear(); _curThumbDiff[i] = 11; } } @@ -1197,7 +1197,7 @@ void RMOptionScreen::doFrame(CORO_PARAM, RMInput *input) { // Turn on edit mode _bEditSaveName = true; _nEditPos = _ctx->i; - strcpy(_editName, _curThumbName[_ctx->i]); + strcpy(_editName, _curThumbName[_ctx->i].c_str()); _ctx->bRefresh = true; } @@ -1386,7 +1386,7 @@ void RMOptionScreen::removeThis(CORO_PARAM, bool &result) { } -bool RMOptionScreen::loadThumbnailFromSaveState(int nState, byte *lpDestBuf, RMString &name, byte &diff) { +bool RMOptionScreen::loadThumbnailFromSaveState(int nState, byte *lpDestBuf, Common::String &name, byte &diff) { Common::String buf; char namebuf[256]; int i; |