diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /engines/teenagent/teenagent.cpp | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/teenagent/teenagent.cpp')
| -rw-r--r-- | engines/teenagent/teenagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index f076dbc0a1..ce8862ffd0 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -240,7 +240,7 @@ Common::Error TeenAgentEngine::loadGameState(int slot) { return Common::kNoError; } -Common::Error TeenAgentEngine::saveGameState(int slot, const char *desc) { +Common::Error TeenAgentEngine::saveGameState(int slot, const Common::String &desc) { debug(0, "saving to slot %d", slot); Common::ScopedPtr<Common::OutSaveFile> out(_saveFileMan->openForSaving(Common::String::format("teenagent.%02d", slot))); if (!out) @@ -253,7 +253,7 @@ Common::Error TeenAgentEngine::saveGameState(int slot, const char *desc) { res->dseg.set_word(0x64B1, pos.y); assert(res->dseg.size() >= 0x6478 + 0x777a); - strncpy((char *)res->dseg.ptr(0x6478), desc, 0x16); + strncpy((char *)res->dseg.ptr(0x6478), desc.c_str(), 0x16); out->write(res->dseg.ptr(0x6478), 0x777a); if (!Graphics::saveThumbnail(*out)) warning("saveThumbnail failed"); |