diff options
author | Max Horn | 2005-05-10 23:17:38 +0000 |
---|---|---|
committer | Max Horn | 2005-05-10 23:17:38 +0000 |
commit | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (patch) | |
tree | 6686cad5726244b7d9d3a4adddde8dea92ce7843 /sky/control.cpp | |
parent | b75c969e666b9f262a05e0d1e54d56f7d3e45441 (diff) | |
download | scummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.tar.gz scummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.tar.bz2 scummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.zip |
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
svn-id: r18038
Diffstat (limited to 'sky/control.cpp')
-rw-r--r-- | sky/control.cpp | 14 |
1 files changed, 7 insertions, 7 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; |