diff options
author | David Turner | 2011-01-25 01:58:26 +0000 |
---|---|---|
committer | David Turner | 2011-01-25 01:58:26 +0000 |
commit | ccb1faef7eae4325a44f636c4c13f3eabd4b8e79 (patch) | |
tree | 0e558a5673ad364a0f1b1746dc7c7bb0b53ce3e9 /engines | |
parent | 1a44ed588f86a6be2929f0232edbccd2ce535c03 (diff) | |
download | scummvm-rg350-ccb1faef7eae4325a44f636c4c13f3eabd4b8e79.tar.gz scummvm-rg350-ccb1faef7eae4325a44f636c4c13f3eabd4b8e79.tar.bz2 scummvm-rg350-ccb1faef7eae4325a44f636c4c13f3eabd4b8e79.zip |
PARALLACTION: Removal of unecessary returns and whitespace fixes to saveload.*
svn-id: r55510
Diffstat (limited to 'engines')
-rw-r--r-- | engines/parallaction/saveload.cpp | 24 | ||||
-rw-r--r-- | engines/parallaction/saveload.h | 6 |
2 files changed, 0 insertions, 30 deletions
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 855dc12105..da41e2c9a3 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -36,7 +36,6 @@ #include "parallaction/saveload.h" #include "parallaction/sound.h" - /* Nippon Safes savefiles are called 'nippon.000' to 'nippon.099'. * * A special savefile named 'nippon.999' holds information on whether the user completed one or more parts of the game. @@ -47,7 +46,6 @@ namespace Parallaction { - Common::String SaveLoad::genSaveFileName(uint slot) { assert(slot < NUM_SAVESLOTS || slot == SPECIAL_SAVESLOT); @@ -67,9 +65,7 @@ Common::OutSaveFile *SaveLoad::getOutSaveFile(uint slot) { return _saveFileMan->openForSaving(name); } - void SaveLoad_ns::doLoadGame(uint16 slot) { - _vm->cleanupGame(); Common::InSaveFile *f = getInSaveFile(slot); @@ -130,13 +126,9 @@ void SaveLoad_ns::doLoadGame(uint16 slot) { char tmp[PATH_LEN]; sprintf(tmp, "%s.%s" , location.c_str(), character.c_str()); _vm->scheduleLocationSwitch(tmp); - - return; } - void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) { - Common::OutSaveFile *f = getOutSaveFile(slot); if (f == 0) { char buf[32]; @@ -187,14 +179,9 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) { } delete f; - - return; } - - int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button) { - GUI::SaveLoadChooser slc(caption, button); slc.setSaveMode(saveMode); @@ -214,8 +201,6 @@ int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const return idx; } - - bool SaveLoad::loadGame() { Common::String null; int _di = selectSaveFile(null, false, "Load file", "Load"); @@ -231,7 +216,6 @@ bool SaveLoad::loadGame() { return true; } - bool SaveLoad::saveGame() { Common::String saveName; int slot = selectSaveFile(saveName, true, "Save file", "Save"); @@ -247,7 +231,6 @@ bool SaveLoad::saveGame() { return true; } - bool SaveLoad_ns::saveGame() { // NOTE: shouldn't this check be done before, so that the // user can't even select 'save'? @@ -279,8 +262,6 @@ void SaveLoad_ns::setPartComplete(const char *part) { outFile->finalize(); delete outFile; } - - return; } void SaveLoad_ns::getGamePartProgress(bool *complete, int size) { @@ -353,19 +334,14 @@ void SaveLoad_ns::renameOldSavefiles() { GUI::MessageDialog dialog1(msg); dialog1.runModal(); - - return; } - void SaveLoad_br::doLoadGame(uint16 slot) { // TODO: implement loadgame - return; } void SaveLoad_br::doSaveGame(uint16 slot, const char* name) { // TODO: implement savegame - return; } void SaveLoad_br::getGamePartProgress(bool *complete, int size) { diff --git a/engines/parallaction/saveload.h b/engines/parallaction/saveload.h index 80a2c4d8a9..a8f1697a9d 100644 --- a/engines/parallaction/saveload.h +++ b/engines/parallaction/saveload.h @@ -23,7 +23,6 @@ * */ - #ifndef PARALLACTION_SAVELOAD_H #define PARALLACTION_SAVELOAD_H @@ -31,9 +30,7 @@ namespace Parallaction { struct Character; - class SaveLoad { - protected: Common::SaveFileManager *_saveFileMan; Common::String _saveFilePrefix; @@ -60,7 +57,6 @@ public: }; class SaveLoad_ns : public SaveLoad { - Parallaction_ns *_vm; protected: @@ -78,7 +74,6 @@ public: }; class SaveLoad_br : public SaveLoad { - Parallaction_br *_vm; virtual void doLoadGame(uint16 slot); virtual void doSaveGame(uint16 slot, const char* name); @@ -90,7 +85,6 @@ public: virtual void setPartComplete(const char *part); }; - } // namespace Parallaction #endif |