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

KYRA: Get rid of most snprintf usages.

Browse source 
Thanks to digitall for his initial patch, which I only altered slightly.
This commit is contained in:
Johannes Schickel 2011-06-09 19:09:54 +02:00
parent 89ed49d7e9
commit 80d0bc0c85
14 changed files with 117 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/kyra/script_lol.cpp
View file

@ -1136,9 +1136,8 @@ int LoLEngine::olol_loadTimScript(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadTimScript(%p) (%d, %s)", (const void *)script, stackPos(0), stackPosString(1));
if (_activeTim[stackPos(0)])
return 1;
char file[13];
snprintf(file, sizeof(file), "%s.TIM", stackPosString(1));
_activeTim[stackPos(0)] = _tim->load(file, &_timIngameOpcodes);
Common::String file = Common::String::format("%s.TIM", stackPosString(1));
_activeTim[stackPos(0)] = _tim->load(file.c_str(), &_timIngameOpcodes);
return 1;
}
@ -1185,10 +1184,9 @@ int LoLEngine::olol_giveItemToMonster(EMCState *script) {
int LoLEngine::olol_loadLangFile(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadLangFile(%p) (%s)", (const void *)script, stackPosString(0));
char filename[13];
snprintf(filename, sizeof(filename), "%s.%s", stackPosString(0), _languageExt[_lang]);
Common::String filename = Common::String::format("%s.%s", stackPosString(0), _languageExt[_lang]);
delete[] _levelLangFile;
_levelLangFile = _res->fileData(filename, 0);
_levelLangFile = _res->fileData(filename.c_str(), 0);
return 1;
}