diff options
| author | Strangerke | 2015-12-19 14:14:11 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:35:30 +0100 |
| commit | 2981ccc24384aef44ff34a00ab547462735d6632 (patch) | |
| tree | c2664e00fd0b69c180ec94cf5312b1c7461d1a99 | |
| parent | 1d9e3cd561272ca318c522b8045af4f1dca2a6d9 (diff) | |
| download | scummvm-rg350-2981ccc24384aef44ff34a00ab547462735d6632.tar.gz scummvm-rg350-2981ccc24384aef44ff34a00ab547462735d6632.tar.bz2 scummvm-rg350-2981ccc24384aef44ff34a00ab547462735d6632.zip | |
LAB: get rid of the last strcpy
| -rw-r--r-- | engines/lab/special.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 7bb09e6a91..fa08fdc40b 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -110,8 +110,7 @@ void LabEngine::loadJournalData() { _journalFont = _resource->getFont("F:Journal.fon"); _music->updateMusic(); - char filename[20]; - strcpy(filename, "Lab:Rooms/j0"); + Common::String filename = "Lab:Rooms/j0"; bool bridge = _conditions->in(BRIDGE0) || _conditions->in(BRIDGE1); bool dirty = _conditions->in(DIRTY); @@ -119,25 +118,25 @@ void LabEngine::loadJournalData() { bool clean = !_conditions->in(NOCLEAN); if (bridge && clean && news) - filename[11] = '8'; + filename += '8'; else if (clean && news) - filename[11] = '9'; + filename += '9'; else if (bridge && clean) - filename[11] = '6'; + filename += '6'; else if (clean) - filename[11] = '7'; + filename += '7'; else if (bridge && dirty && news) - filename[11] = '4'; + filename += '4'; else if (dirty && news) - filename[11] = '5'; + filename += '5'; else if (bridge && dirty) - filename[11] = '2'; + filename += '2'; else if (dirty) - filename[11] = '3'; + filename += '3'; else if (bridge) - filename[11] = '1'; + filename += '1'; - _journalText = _resource->getText(filename); + _journalText = _resource->getText(filename.c_str()); _journalTextTitle = _resource->getText("Lab:Rooms/jt"); Common::File *journalFile = _resource->openDataFile("P:JImage"); |