diff options
author | Adrian Frühwirth | 2018-03-18 01:14:00 +0100 |
---|---|---|
committer | Adrian Frühwirth | 2018-03-18 01:17:00 +0100 |
commit | 51027a02cf1dc3f45c2b95da82b94179a25b8c19 (patch) | |
tree | bf3404639bdc5f65b72a7fda30da52c48a8f778e /engines/tucker/resource.cpp | |
parent | 9e341e12c86fe5f1a2aeadab3a320bb524ce25a5 (diff) | |
download | scummvm-rg350-51027a02cf1dc3f45c2b95da82b94179a25b8c19.tar.gz scummvm-rg350-51027a02cf1dc3f45c2b95da82b94179a25b8c19.tar.bz2 scummvm-rg350-51027a02cf1dc3f45c2b95da82b94179a25b8c19.zip |
TUCKER: Get rid of strcpy()
Diffstat (limited to 'engines/tucker/resource.cpp')
-rw-r--r-- | engines/tucker/resource.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index 0ea24adf2d..1159882381 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -708,25 +708,15 @@ void TuckerEngine::loadData4() { } void TuckerEngine::loadActionFile() { - char filename[40]; - if ((_gameFlags & kGameFlagDemo) != 0) { - strcpy(filename, "action.c"); + assert(_part != kPartInit); + + Common::String filename; + if (_gameFlags & kGameFlagDemo) { + filename = "action.c"; } else { - switch (_part) { - case kPartOne: - strcpy(filename, "action1.c"); - break; - case kPartTwo: - strcpy(filename, "action2.c"); - break; - case kPartThree: - strcpy(filename, "action3.c"); - break; - default: - break; - } + filename = Common::String::format("action%d.c", _part); } - loadFile(filename, _loadTempBuf); + loadFile(filename.c_str(), _loadTempBuf); DataTokenizer t(_loadTempBuf, _fileLoadSize); _actionsCount = 0; |