[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.112,1.113 saveload.cpp,1.156,1.157 script_v5.cpp,1.239,1.240 script_v8.cpp,2.250,2.251 scumm.h,1.411,1.412
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 25 15:40:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14375/scumm
Modified Files:
dialogs.cpp saveload.cpp script_v5.cpp script_v8.cpp scumm.h
Log Message:
Added Engine::_saveFileMan; thus was able to get rid of auto_ptr usage again
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- dialogs.cpp 25 Jun 2004 22:12:57 -0000 1.112
+++ dialogs.cpp 25 Jun 2004 22:39:19 -0000 1.113
@@ -44,8 +44,6 @@
#include "backends/wince/CEKeysDialog.h"
#endif
-#include <memory>
-
using GUI::CommandSender;
using GUI::StaticTextWidget;
using GUI::kButtonWidth;
@@ -257,12 +255,10 @@
uint i = saveMode ? 1 : 0;
bool avail_saves[81];
- const std::auto_ptr<SaveFileManager> mgr(OSystem::instance()->get_savefile_manager());
-
- scumm->listSavegames(avail_saves, ARRAYSIZE(avail_saves), mgr.get());
+ scumm->listSavegames(avail_saves, ARRAYSIZE(avail_saves));
for (; i < ARRAYSIZE(avail_saves); i++) {
if (avail_saves[i])
- scumm->getSavegameName(i, name, mgr.get());
+ scumm->getSavegameName(i, name);
else
name[0] = 0;
l.push_back(name);
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- saveload.cpp 25 Jun 2004 21:48:12 -0000 1.156
+++ saveload.cpp 25 Jun 2004 22:39:19 -0000 1.157
@@ -38,8 +38,6 @@
#include "sound/audiocd.h"
#include "sound/mixer.h"
-#include <memory>
-
namespace Scumm {
struct SaveGameHeader {
@@ -65,15 +63,13 @@
}
bool ScummEngine::saveState(int slot, bool compat) {
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
char filename[256];
SaveFile *out;
SaveGameHeader hdr;
makeSavegameName(filename, slot, compat);
- if (!(out = mgr->open_savefile(filename, getSavePath(), true)))
+ if (!(out = _saveFileMan->open_savefile(filename, getSavePath(), true)))
return false;
memcpy(hdr.name, _saveLoadName, sizeof(hdr.name));
@@ -92,8 +88,6 @@
}
bool ScummEngine::loadState(int slot, bool compat) {
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
char filename[256];
SaveFile *in;
int i, j;
@@ -101,7 +95,7 @@
byte *roomptr;
makeSavegameName(filename, slot, compat);
- if (!(in = mgr->open_savefile(filename, getSavePath(), false)))
+ if (!(in = _saveFileMan->open_savefile(filename, getSavePath(), false)))
return false;
in->read(&hdr, sizeof(hdr));
@@ -300,21 +294,21 @@
sprintf(out, "%s.%c%.2d", _targetName.c_str(), compatible ? 'c' : 's', slot);
}
-void ScummEngine::listSavegames(bool *marks, int num, SaveFileManager *mgr) {
+void ScummEngine::listSavegames(bool *marks, int num) {
char prefix[256];
makeSavegameName(prefix, 99, false);
prefix[strlen(prefix)-2] = 0;
- mgr->list_savefiles(prefix, getSavePath(), marks, num);
+ _saveFileMan->list_savefiles(prefix, getSavePath(), marks, num);
}
-bool ScummEngine::getSavegameName(int slot, char *desc, SaveFileManager *mgr) {
+bool ScummEngine::getSavegameName(int slot, char *desc) {
char filename[256];
SaveFile *out;
SaveGameHeader hdr;
int len;
makeSavegameName(filename, slot, false);
- if (!(out = mgr->open_savefile(filename, getSavePath(), false))) {
+ if (!(out = _saveFileMan->open_savefile(filename, getSavePath(), false))) {
strcpy(desc, "");
return false;
}
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- script_v5.cpp 25 Jun 2004 22:12:57 -0000 1.239
+++ script_v5.cpp 25 Jun 2004 22:39:20 -0000 1.240
@@ -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 @@
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 @@
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 @@
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;
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.250
retrieving revision 2.251
diff -u -d -r2.250 -r2.251
--- script_v8.cpp 25 Jun 2004 22:12:57 -0000 2.250
+++ script_v8.cpp 25 Jun 2004 22:39:20 -0000 2.251
@@ -34,8 +34,6 @@
#include "scumm/smush/smush_player.h"
#include "sound/mixer.h"
-#include <memory>
-
namespace Scumm {
#define OPCODE(x) { &ScummEngine_v8::x, #x }
@@ -1323,7 +1321,6 @@
warning("o8_kernelSetFunctions: clearTextQueue()");
break;
case 25: { // saveGameReadName
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
char *address = (char*)getStringAddress(args[2]);
char name[30];
@@ -1331,14 +1328,12 @@
warning("o8_kernelSetFunctions: saveGameReadName failed finding slot string %d", args[2]);
break;
}
- getSavegameName(args[1] - 1, name, mgr.get());
+ getSavegameName(args[1] - 1, name);
if (strlen(name) > 0 && strlen(name) < 30)
strcpy(address, name);
break;
}
case 26: { // saveGame?
- //const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
//char *address = (char*)getStringAddress(args[2]);
char address[30];
warning("o8_kernelSetFunctions: saveGame?(%d, %s)", args[1], address);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -r1.411 -r1.412
--- scumm.h 25 Jun 2004 21:48:12 -0000 1.411
+++ scumm.h 25 Jun 2004 22:39:20 -0000 1.412
@@ -518,8 +518,8 @@
int getKeyState(int key);
public:
- bool getSavegameName(int slot, char *desc, SaveFileManager *mgr);
- void listSavegames(bool *marks, int num, SaveFileManager *mgr);
+ bool getSavegameName(int slot, char *desc);
+ void listSavegames(bool *marks, int num);
void requestSave(int slot, const char *name, bool compatible = false);
void requestLoad(int slot);
More information about the Scummvm-git-logs
mailing list