diff options
| author | Max Horn | 2004-06-25 22:39:21 +0000 |
|---|---|---|
| committer | Max Horn | 2004-06-25 22:39:21 +0000 |
| commit | 6b722ff11bcaa4622cf662245819993316eb8c5d (patch) | |
| tree | 32c18fbb30a80698904e50377b5ce2b83739246d /scumm/script_v5.cpp | |
| parent | 7a8d469c666f162570f633ec465798e1e5720eef (diff) | |
| download | scummvm-rg350-6b722ff11bcaa4622cf662245819993316eb8c5d.tar.gz scummvm-rg350-6b722ff11bcaa4622cf662245819993316eb8c5d.tar.bz2 scummvm-rg350-6b722ff11bcaa4622cf662245819993316eb8c5d.zip | |
Added Engine::_saveFileMan; thus was able to get rid of auto_ptr usage again
svn-id: r14058
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index a5d465d48a..19438b80bf 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -29,8 +29,6 @@ #include "scumm/sound.h" #include "scumm/verbs.h" -#include <memory> - namespace Scumm { #define OPCODE(x) { &ScummEngine_v5::x, #x } @@ -1174,11 +1172,10 @@ void ScummEngine_v5::o5_saveLoadGame() { case 0xC0: // test if save exists bool avail_saves[100]; char filename[256]; - const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager()); - listSavegames(avail_saves, ARRAYSIZE(avail_saves), mgr.get()); + listSavegames(avail_saves, ARRAYSIZE(avail_saves)); makeSavegameName(filename, slot, false); - if (avail_saves[slot] && (mgr->open_savefile(filename, getSavePath(), false))) + if (avail_saves[slot] && (_saveFileMan->open_savefile(filename, getSavePath(), false))) result = 6; // save file exists else result = 7; // save file does not exist @@ -1941,9 +1938,7 @@ void ScummEngine_v5::o5_roomOps() { s = filename; while ((*s++ = fetchScriptByte())); - const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager()); - - file = mgr->open_savefile(filename, getSavePath(), true); + file = _saveFileMan->open_savefile(filename, getSavePath(), true); if (file != NULL) { byte *ptr; ptr = getResourceAddress(rtString, a); @@ -1961,9 +1956,7 @@ void ScummEngine_v5::o5_roomOps() { s = filename; while ((*s++ = fetchScriptByte())); - const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager()); - - file = mgr->open_savefile(filename, getSavePath(), false); + file = _saveFileMan->open_savefile(filename, getSavePath(), false); if (file != NULL) { byte *ptr; int len = 256, cnt = 0; |