[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.41,1.42 control.h,1.17,1.18 sword1.cpp,1.65,1.66
Max Horn
fingolfin at users.sourceforge.net
Fri Nov 26 17:15:38 CET 2004
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24926/sword1
Modified Files:
control.cpp control.h sword1.cpp
Log Message:
Moved Engine::getSavePath() to class SaveFileManager; removed the 'directory' parameter from SaveFileManager::openSavefile and listSavefiles (they always use getSavePath() now, which is what we did anyway)
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- control.cpp 15 Nov 2004 08:23:08 -0000 1.41
+++ control.cpp 27 Nov 2004 00:26:00 -0000 1.42
@@ -156,7 +156,7 @@
draw();
}
-Control::Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic, const char *savePath) {
+Control::Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
_saveFileMan = saveFileMan;
_resMan = pResMan;
_objMan = pObjMan;
@@ -164,7 +164,6 @@
_mouse = pMouse;
_music = pMusic;
_sound = pSound;
- strcpy(_savePath, savePath);
_lStrings = _languageStrings + SwordEngine::_systemVars.language * 20;
}
@@ -670,7 +669,7 @@
void Control::readSavegameDescriptions(void) {
SaveFile *inf;
- inf = _saveFileMan->open_savefile("SAVEGAME.INF", _savePath, SAVEFILE_READ);
+ inf = _saveFileMan->openSavefile("SAVEGAME.INF", SAVEFILE_READ);
_saveScrollPos = _saveFiles = 0;
_selectedSavegame = 255;
if (inf && inf->isOpen()) {
@@ -713,11 +712,11 @@
void Control::writeSavegameDescriptions(void) {
SaveFile *outf;
- outf = _saveFileMan->open_savefile("SAVEGAME.INF", _savePath, SAVEFILE_WRITE);
+ outf = _saveFileMan->openSavefile("SAVEGAME.INF", SAVEFILE_WRITE);
if (!outf) {
// Display an error message, and do nothing
- displayMessage(0, "Unable to write to path '%s'", _savePath);
+ displayMessage(0, "Unable to write to path '%s'", _saveFileMan->getSavePath());
return;
}
@@ -738,7 +737,7 @@
bool Control::savegamesExist(void) {
bool retVal = false;
SaveFile *inf;
- inf = _saveFileMan->open_savefile("SAVEGAME.INF", _savePath, SAVEFILE_READ);
+ inf = _saveFileMan->openSavefile("SAVEGAME.INF", SAVEFILE_READ);
if (inf && inf->isOpen())
retVal = true;
delete inf;
@@ -895,10 +894,10 @@
sprintf(fName, "SAVEGAME.%03d", slot);
uint16 liveBuf[TOTAL_SECTIONS];
SaveFile *outf;
- outf = _saveFileMan->open_savefile(fName, _savePath, SAVEFILE_WRITE);
+ outf = _saveFileMan->openSavefile(fName, SAVEFILE_WRITE);
if (!outf || !outf->isOpen()) {
// Display an error message, and do nothing
- displayMessage(0, "Unable to create file '%s' in directory '%s'", fName, _savePath);
+ displayMessage(0, "Unable to create file '%s' in directory '%s'", fName, _saveFileMan->getSavePath());
return;
}
@@ -928,10 +927,10 @@
uint16 cnt;
sprintf(fName, "SAVEGAME.%03d", slot);
SaveFile *inf;
- inf = _saveFileMan->open_savefile(fName, _savePath, SAVEFILE_READ);
+ inf = _saveFileMan->openSavefile(fName, SAVEFILE_READ);
if (!inf || !inf->isOpen()) {
// Display an error message, and do nothing
- displayMessage(0, "Can't open file '%s' in directory '%s'", fName, _savePath);
+ displayMessage(0, "Can't open file '%s' in directory '%s'", fName, _saveFileMan->getSavePath());
return false;
}
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- control.h 9 Nov 2004 04:06:09 -0000 1.17
+++ control.h 27 Nov 2004 00:26:00 -0000 1.18
@@ -68,7 +68,7 @@
class Control {
public:
- Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic, const char *savePath);
+ Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic);
uint8 runPanel(void);
void doRestore(void);
void askForCd(void);
@@ -126,7 +126,6 @@
Mouse *_mouse;
Music *_music;
Sound *_sound;
- char _savePath[256];
uint8 *_font, *_redFont;
uint8 *_screenBuf;
uint8 _keyPressed;
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- sword1.cpp 24 Nov 2004 00:14:19 -0000 1.65
+++ sword1.cpp 27 Nov 2004 00:26:00 -0000 1.66
@@ -201,7 +201,7 @@
_logic->initialize();
_objectMan->initialize();
_mouse->initialize();
- _control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music, getSavePath());
+ _control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music);
return 0;
}
More information about the Scummvm-git-logs
mailing list