aboutsummaryrefslogtreecommitdiff
path: root/sword1/control.cpp
diff options
context:
space:
mode:
authorMax Horn2005-05-10 23:17:38 +0000
committerMax Horn2005-05-10 23:17:38 +0000
commit72f4c03b0b9a6918a359b967ebc400a2701981d9 (patch)
tree6686cad5726244b7d9d3a4adddde8dea92ce7843 /sword1/control.cpp
parentb75c969e666b9f262a05e0d1e54d56f7d3e45441 (diff)
downloadscummvm-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 'sword1/control.cpp')
-rw-r--r--sword1/control.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/sword1/control.cpp b/sword1/control.cpp
index a572aaee4a..616a03db0a 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -157,7 +157,7 @@ void ControlButton::setSelected(uint8 selected) {
draw();
}
-Control::Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
+Control::Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
_saveFileMan = saveFileMan;
_resMan = pResMan;
_objMan = pObjMan;
@@ -669,7 +669,7 @@ bool Control::restoreFromFile(void) {
}
void Control::readSavegameDescriptions(void) {
- InSaveFile *inf;
+ Common::InSaveFile *inf;
inf = _saveFileMan->openForLoading("SAVEGAME.INF");
_saveScrollPos = _saveFiles = 0;
_selectedSavegame = 255;
@@ -712,7 +712,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
}
void Control::writeSavegameDescriptions(void) {
- OutSaveFile *outf;
+ Common::OutSaveFile *outf;
outf = _saveFileMan->openForSaving("SAVEGAME.INF");
if (!outf) {
@@ -737,7 +737,7 @@ void Control::writeSavegameDescriptions(void) {
bool Control::savegamesExist(void) {
bool retVal = false;
- InSaveFile *inf;
+ Common::InSaveFile *inf;
inf = _saveFileMan->openForLoading("SAVEGAME.INF");
if (inf)
retVal = true;
@@ -894,7 +894,7 @@ void Control::saveGameToFile(uint8 slot) {
uint16 cnt;
sprintf(fName, "SAVEGAME.%03d", slot);
uint16 liveBuf[TOTAL_SECTIONS];
- OutSaveFile *outf;
+ Common::OutSaveFile *outf;
outf = _saveFileMan->openForSaving(fName);
if (!outf) {
// Display an error message, and do nothing
@@ -927,7 +927,7 @@ bool Control::restoreGameFromFile(uint8 slot) {
char fName[15];
uint16 cnt;
sprintf(fName, "SAVEGAME.%03d", slot);
- InSaveFile *inf;
+ Common::InSaveFile *inf;
inf = _saveFileMan->openForLoading(fName);
if (!inf) {
// Display an error message, and do nothing