libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGI: Rewrite getSavegameFilename() so that it doesn't try to return a pointer to a local variable

Browse Source
This commit is contained in:
Filippos Karapetis 2011-09-25 19:33:01 +03:00
parent b56c5cc370
commit c8777b774f
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agi/agi.h
View File

@ -881,7 +881,7 @@ public:
StringData _stringdata; StringData _stringdata;
const char *getSavegameFilename(int num); void getSavegameFilename(int num, char *fileName);
void getSavegameDescription(int num, char *buf, bool showEmpty = true); void getSavegameDescription(int num, char *buf, bool showEmpty = true);
int selectSlot(); int selectSlot();
int saveGame(const char *fileName, const char *saveName); int saveGame(const char *fileName, const char *saveName);

4
engines/agi/cycle.cpp
View File

@ -361,7 +361,9 @@ int AgiEngine::playGame() {
} }
if (shouldPerformAutoSave(_lastSaveTime)) { if (shouldPerformAutoSave(_lastSaveTime)) {
saveGame(getSavegameFilename(0), "Autosave"); char fileName[MAXPATHLEN];
getSavegameFilename(0, fileName);
saveGame(fileName, "Autosave");
} }
} while (!(shouldQuit() || _restartGame)); } while (!(shouldQuit() || _restartGame));

18
engines/agi/saveload.cpp
View File

@ -546,10 +546,10 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) {
#define NUM_SLOTS 100 #define NUM_SLOTS 100
#define NUM_VISIBLE_SLOTS 12 #define NUM_VISIBLE_SLOTS 12
const char *AgiEngine::getSavegameFilename(int num) { void AgiEngine::getSavegameFilename(int num, char *fileName) {
Common::String saveLoadSlot = _targetName; Common::String saveLoadSlot = _targetName;
saveLoadSlot += Common::String::format(".%.3d", num); saveLoadSlot += Common::String::format(".%.3d", num);
return saveLoadSlot.c_str(); strcpy(fileName, saveLoadSlot.c_str());
} }
void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) { void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) {
@ -557,7 +557,8 @@ void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) {
Common::InSaveFile *in; Common::InSaveFile *in;
debugC(4, kDebugLevelMain | kDebugLevelSavegame, "Current game id is %s", _targetName.c_str()); debugC(4, kDebugLevelMain | kDebugLevelSavegame, "Current game id is %s", _targetName.c_str());
strcpy(fileName, getSavegameFilename(num)); getSavegameFilename(num, fileName);
if (!(in = _saveFileMan->openForLoading(fileName))) { if (!(in = _saveFileMan->openForLoading(fileName))) {
debugC(4, kDebugLevelMain | kDebugLevelSavegame, "File %s does not exist", fileName); debugC(4, kDebugLevelMain | kDebugLevelSavegame, "File %s does not exist", fileName);
@ -852,7 +853,7 @@ int AgiEngine::saveGameDialog() {
return errOK; return errOK;
} }
strcpy(fileName, getSavegameFilename(_firstSlot + slot)); getSavegameFilename(_firstSlot + slot, fileName);
debugC(8, kDebugLevelMain | kDebugLevelResources, "file is [%s]", fileName); debugC(8, kDebugLevelMain | kDebugLevelResources, "file is [%s]", fileName);
// Make sure all graphics was blitted to screen. This fixes bug // Make sure all graphics was blitted to screen. This fixes bug
@ -870,7 +871,10 @@ int AgiEngine::saveGameDialog() {
} }
int AgiEngine::saveGameSimple() { int AgiEngine::saveGameSimple() {
int result = saveGame(getSavegameFilename(0), "Default savegame"); char fileName[MAXPATHLEN];
getSavegameFilename(0, fileName);
int result = saveGame(fileName, "Default savegame");
if (result != errOK) if (result != errOK)
messageBox("Error saving game."); messageBox("Error saving game.");
return result; return result;
@ -904,7 +908,7 @@ int AgiEngine::loadGameDialog() {
return errOK; return errOK;
} }
sprintf(fileName, "%s", getSavegameFilename(_firstSlot + slot)); getSavegameFilename(_firstSlot + slot, fileName);
if ((rc = loadGame(fileName)) == errOK) { if ((rc = loadGame(fileName)) == errOK) {
messageBox("Game restored."); messageBox("Game restored.");
@ -921,7 +925,7 @@ int AgiEngine::loadGameSimple() {
char fileName[MAXPATHLEN]; char fileName[MAXPATHLEN];
int rc = 0; int rc = 0;
sprintf(fileName, "%s", getSavegameFilename(0)); getSavegameFilename(0, fileName);
_sprites->eraseBoth(); _sprites->eraseBoth();
_sound->stopSound(); _sound->stopSound();