Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

svn-id: r18038

2 files changed, 12 insertions, 10 deletions

diff --git a/sky/control.cpp b/sky/control.cpp
index 4272ffe558..2ddb0639bb 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -194,7 +194,7 @@ void ControlStatus::drawToScreen(void) {
 	_statusText->drawToScreen(WITH_MASK);
 }
 
-Control::Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, SkyCompact *skyCompact, OSystem *system) {
+Control::Control(Common::SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, SkyCompact *skyCompact, OSystem *system) {
 	_saveFileMan = saveFileMan;
 
 	_skyScreen = screen;
@@ -784,7 +784,7 @@ uint16 Control::shiftUp(uint8 speed) {
 bool Control::autoSaveExists(void) {
 
 	bool test = false;
-	InSaveFile *f;
+	Common::InSaveFile *f;
 	char fName[20];
 	if (SkyEngine::isCDVersion())
 		strcpy(fName, "SKY-VM-CD.ASD");
@@ -1012,7 +1012,7 @@ void Control::loadDescriptions(uint8 *destBuf) {
 
 	memset(destBuf, 0, MAX_SAVE_GAMES * MAX_TEXT_LEN);
 
-	InSaveFile *inf;
+	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading("SKY-VM.SAV");
 	if (inf != NULL) {
 		uint8 *tmpBuf = (uint8 *)malloc(MAX_SAVE_GAMES * MAX_TEXT_LEN);
@@ -1084,7 +1084,7 @@ void Control::saveDescriptions(uint8 *srcBuf) {
 		tmpPos++;
 		srcPos += MAX_TEXT_LEN;
 	}
-	OutSaveFile *outf;
+	Common::OutSaveFile *outf;
 
 	outf = _saveFileMan->openForSaving("SKY-VM.SAV");
 	if (outf != NULL) {
@@ -1100,7 +1100,7 @@ void Control::doAutoSave(void) {
 		strcpy(fName, "SKY-VM-CD.ASD");
 	else
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
-	OutSaveFile *outf;
+	Common::OutSaveFile *outf;
 
 	outf = _saveFileMan->openForSaving(fName);
 	if (outf == NULL) {
@@ -1121,7 +1121,7 @@ uint16 Control::saveGameToFile(void) {
 	char fName[20];
 	sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
-	OutSaveFile *outf;
+	Common::OutSaveFile *outf;
 	outf = _saveFileMan->openForSaving(fName);
 	if (outf == NULL) {
 		return NO_DISK_SPACE;
@@ -1396,7 +1396,7 @@ uint16 Control::restoreGameFromFile(bool autoSave) {
 	} else
 		sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
-	InSaveFile *inf;
+	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading(fName);
 	if (inf == NULL) {
 		return RESTORE_FAILED;
diff --git a/sky/control.h b/sky/control.h
index 85edbea191..68edf85c00 100644
--- a/sky/control.h
+++ b/sky/control.h
@@ -26,7 +26,9 @@
 #include "common/scummsys.h"
 
 class OSystem;
-class SaveFileManager;
+namespace Common {
+	class SaveFileManager;
+}
 
 namespace Sky {
 
@@ -175,7 +177,7 @@ private:
 
 class Control {
 public:
-	Control(SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, SkyCompact *skyCompact, OSystem *system);
+	Control(Common::SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, SkyCompact *skyCompact, OSystem *system);
 	void doControlPanel(void);
 	void doLoadSavePanel(void);
 	void restartGame(void);
@@ -226,7 +228,7 @@ private:
 	void importOldCompact(Compact* destCpt, uint8 **srcPos, uint16 numElems, uint16 type, char *name);
 	uint16 parseSaveData(uint8 *srcBuf);
 
-	SaveFileManager *_saveFileMan;
+	Common::SaveFileManager *_saveFileMan;
 	SkyCompact *_skyCompact;
 	Screen *_skyScreen;
 	Disk *_skyDisk;