libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 11:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: get rid of the last strcpy

Browse Source
This commit is contained in:
Strangerke 2015-12-19 14:14:11 +01:00 committed by Willem Jan Palenstijn
parent 1d9e3cd561
commit 2981ccc243
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/lab/special.cpp
View File

@ -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");