[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.79,1.80 control.h,1.33,1.34 sky.cpp,1.159,1.160

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24926/sky

Modified Files:
	control.cpp control.h sky.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/sky/control.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- control.cpp	12 Nov 2004 18:12:41 -0000	1.79
+++ control.cpp	27 Nov 2004 00:26:00 -0000	1.80
@@ -191,7 +191,7 @@
 	_statusText->drawToScreen(WITH_MASK);
 }
 
-Control::Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system, const char *savePath) {
+Control::Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system) {
 	_saveFileMan = saveFileMan;
 
 	_skyScreen = screen;
@@ -202,7 +202,6 @@
 	_skyLogic = logic;
 	_skySound = sound;
 	_system = system;
-	_savePath = savePath;
 	_memListRoot = NULL;
 }
 
@@ -788,7 +787,7 @@
 	else
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
 
-	f = _saveFileMan->open_savefile(fName, _savePath, false);
+	f = _saveFileMan->openSavefile(fName, false);
 	if (f != NULL) {
 		test = true;
 		delete f;
@@ -887,7 +886,7 @@
 						refreshNames = true;
 					}
 					if (clickRes == NO_DISK_SPACE) {
-						displayMessage(0, "Could not save game in directory '%s'", _savePath);
+						displayMessage(0, "Could not save game in directory '%s'", _saveFileMan->getSavePath());
 						quitPanel = true;
 					}
 					if ((clickRes == CANCEL_PRESSED) || (clickRes == GAME_RESTORED))
@@ -1010,7 +1009,7 @@
 	memset(destBuf, 0, MAX_SAVE_GAMES * MAX_TEXT_LEN);
 
 	SaveFile *inf;
-	inf = _saveFileMan->open_savefile("SKY-VM.SAV",_savePath,false);
+	inf = _saveFileMan->openSavefile("SKY-VM.SAV", false);
 	if (inf != NULL) {
 		uint8 *tmpBuf = (uint8 *)malloc(MAX_SAVE_GAMES * MAX_TEXT_LEN);
 		inf->read(tmpBuf, MAX_SAVE_GAMES * MAX_TEXT_LEN);
@@ -1087,7 +1086,7 @@
 	}
 	SaveFile *outf;
 
-	outf = _saveFileMan->open_savefile("SKY-VM.SAV", _savePath, true);
+	outf = _saveFileMan->openSavefile("SKY-VM.SAV", true);
 	if (outf != NULL) {
 		outf->write(tmpBuf, tmpPos - tmpBuf);
 		delete outf;
@@ -1103,16 +1102,16 @@
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
 	SaveFile *outf;
 
-	outf = _saveFileMan->open_savefile(fName, _savePath, true);
+	outf = _saveFileMan->openSavefile(fName, true);
 	if (outf == NULL) {
-		displayMessage(0, "Unable to create autosave file '%s' in directory '%s'", fName, _savePath);
+		displayMessage(0, "Unable to create autosave file '%s' in directory '%s'", fName, _saveFileMan->getSavePath());
 		return;
 	}
 	uint8 *saveData = (uint8 *)malloc(0x20000);
 	uint32 fSize = prepareSaveData(saveData);
 
 	if (outf->write(saveData, fSize) != fSize)
-		displayMessage(0, "Unable to write autosave file '%s' in directory '%s'. Disk full?", fName, _savePath);
+		displayMessage(0, "Unable to write autosave file '%s' in directory '%s'. Disk full?", fName, _saveFileMan->getSavePath());
 
 	delete outf;
 	free(saveData);
@@ -1124,7 +1123,7 @@
 	sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
 	SaveFile *outf;
-	outf = _saveFileMan->open_savefile(fName, _savePath, true);
+	outf = _saveFileMan->openSavefile(fName, true);
 	if (outf == NULL) {
 		return NO_DISK_SPACE;
 	}
@@ -1529,7 +1528,7 @@
 		sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
 	SaveFile *inf;
-	inf = _saveFileMan->open_savefile(fName, _savePath, false);
+	inf = _saveFileMan->openSavefile(fName, false);
 	if (inf == NULL) {
 		return RESTORE_FAILED;
 	}

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- control.h	18 Jul 2004 18:25:16 -0000	1.33
+++ control.h	27 Nov 2004 00:26:00 -0000	1.34
@@ -175,7 +175,7 @@
 
 class Control {
 public:
-	Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system, const char *savePath);
+	Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system);
 	void doControlPanel(void);
 	void doLoadSavePanel(void);
 	void restartGame(void);
@@ -230,7 +230,6 @@
 	void lodsStr(uint8 **srcPos, uint16 *src);
 	uint16 parseSaveData(uint8 *srcBuf);
 
-	const char *_savePath;
 	uint16 *lz77decode(uint16 *data);
 	void applyDiff(uint16 *data, uint16 *diffData, uint16 len);
 	static Compact *_saveLoadCpts[833]; //-----------------

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- sky.cpp	24 Nov 2004 00:14:18 -0000	1.159
+++ sky.cpp	27 Nov 2004 00:26:00 -0000	1.160
@@ -303,7 +303,7 @@
 	// initialize timer *after* _skyScreen has been initialized.
 	_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
 
-	_skyControl = new Control(_saveFileMan, _skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system, getSavePath());
+	_skyControl = new Control(_saveFileMan, _skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system);
 	_skyLogic->useControlInstance(_skyControl);
 
 	if (_systemVars.gameVersion == 288)