thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Get rid of strcat by using Common::String

Browse source
This commit is contained in:
Strangerke 2015-12-19 17:32:23 +01:00 • committed by Willem Jan Palenstijn
parent d827faf156
commit a2097d2a2e
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/lab/intro.cpp
View file

@ -71,8 +71,7 @@ void Intro::introEatMessages() {
* Reads in a picture.
*/
void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
char path[50] = "Lab:rooms/Intro/";
strcat(path, filename);
Common::String path = Common::String("Lab:rooms/Intro/") + filename;
uint timeDelay = (isScreen) ? 35 : 7;
_vm->_music->updateMusic();
@ -85,7 +84,7 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
bool doneFl = false;
bool begin = true;
Common::File *textFile = _vm->_resource->openDataFile(path);
Common::File *textFile = _vm->_resource->openDataFile(path.c_str());
byte *textBuffer = new byte[textFile->size()];
textFile->read(textBuffer, textFile->size());
delete textFile;