diff options
| author | D G Turner | 2019-09-15 20:20:03 +0100 |
|---|---|---|
| committer | D G Turner | 2019-09-15 20:20:03 +0100 |
| commit | 84d0a294af531c770062f3e65ca9a1b5b1b17f02 (patch) | |
| tree | dc4c7d67aa7c99e6838973b14026bb069479d540 /engines/scumm/imuse/imuse.cpp | |
| parent | 34f3e8667c89a3187878d75528e5cd79e618ba50 (diff) | |
| download | scummvm-rg350-84d0a294af531c770062f3e65ca9a1b5b1b17f02.tar.gz scummvm-rg350-84d0a294af531c770062f3e65ca9a1b5b1b17f02.tar.bz2 scummvm-rg350-84d0a294af531c770062f3e65ca9a1b5b1b17f02.zip | |
SCUMM: Replace Various String Functions with Common String Usage
This removes the dependency on the unsafe strcpy and strcat string
functions with usage of Common::String instead.
Diffstat (limited to 'engines/scumm/imuse/imuse.cpp')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 50a13308d8..1d52539ab5 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -1468,8 +1468,6 @@ void IMuseInternal::initMidiDriver(TimerCallbackInfo *info) { void IMuseInternal::initMT32(MidiDriver *midi) { byte buffer[52]; - char info[256] = "ScummVM "; - int len; // Reset the MT-32 midi->sysEx((const byte *) "\x41\x10\x16\x12\x7f\x00\x00\x01\x00", 9); @@ -1485,15 +1483,16 @@ void IMuseInternal::initMT32(MidiDriver *midi) { _system->delayMillis(250); // Compute version string (truncated to 20 chars max.) - strcat(info, gScummVMVersion); - len = strlen(info); + Common::String infoStr = "ScummVM "; + infoStr += gScummVMVersion; + int len = infoStr.size(); if (len > 20) len = 20; // Display a welcome message on MT-32 displays. memcpy(&buffer[0], "\x41\x10\x16\x12\x20\x00\x00", 7); memcpy(&buffer[7], " ", 20); - memcpy(buffer + 7 + (20 - len) / 2, info, len); + memcpy(buffer + 7 + (20 - len) / 2, infoStr.c_str(), len); byte checksum = 0; for (int i = 4; i < 27; ++i) checksum -= buffer[i]; |