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

AGI: Replace snprintf() usage with Common::String::format()

Browse source 
Safer and less portability issues.
This commit is contained in:
D G Turner 2011-06-02 19:46:55 +01:00
parent 9e86b0bea1
commit 305c6b4d83
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/agi/saveload.cpp
View file

@ -551,11 +551,8 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) {
#define NUM_VISIBLE_SLOTS 12
const char *AgiEngine::getSavegameFilename(int num) {
static Common::String saveLoadSlot;
char extension[5];
snprintf(extension, sizeof(extension), ".%.3d", num);
saveLoadSlot = _targetName + extension;
Common::String saveLoadSlot = _targetName;
saveLoadSlot += Common::String::format(".%.3d", num);
return saveLoadSlot.c_str();
}
@ -987,14 +984,12 @@ void AgiEngine::releaseImageStack() {
void AgiEngine::checkQuickLoad() {
if (ConfMan.hasKey("save_slot")) {
char saveNameBuffer[256];
snprintf(saveNameBuffer, 256, "%s.%03d", _targetName.c_str(), ConfMan.getInt("save_slot"));
Common::String saveNameBuffer = Common::String::format("%s.%03d", _targetName.c_str(), ConfMan.getInt("save_slot"));
_sprites->eraseBoth();
_sound->stopSound();
if (loadGame(saveNameBuffer, false) == errOK) { // Do not check game id
if (loadGame(saveNameBuffer.c_str(), false) == errOK) { // Do not check game id
_game.exitAllLogics = 1;
_menu->enableAll();
}