[Scummvm-cvs-logs] SF.net SVN: scummvm:[55510] scummvm/trunk/engines/parallaction

[tdhs at users.sourceforge.net]

Revision: 55510
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55510&view=rev
Author:   tdhs
Date:     2011-01-25 01:58:26 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
PARALLACTION: Removal of unecessary returns and whitespace fixes to saveload.*

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/saveload.cpp
    scummvm/trunk/engines/parallaction/saveload.h

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2011-01-25 01:28:31 UTC (rev 55509)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2011-01-25 01:58:26 UTC (rev 55510)
@@ -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 @@
 	return _saveFileMan->openForSaving(name);
 }
 
-
 void SaveLoad_ns::doLoadGame(uint16 slot) {
-
 	_vm->cleanupGame();
 
 	Common::InSaveFile *f = getInSaveFile(slot);
@@ -130,13 +126,9 @@
 	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 @@
 	}
 
 	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 @@
 	return idx;
 }
 
-
-
 bool SaveLoad::loadGame() {
 	Common::String null;
 	int _di = selectSaveFile(null, false, "Load file", "Load");
@@ -231,7 +216,6 @@
 	return true;
 }
 
-
 bool SaveLoad::saveGame() {
 	Common::String saveName;
 	int slot = selectSaveFile(saveName, true, "Save file", "Save");
@@ -247,7 +231,6 @@
 	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 @@
 		outFile->finalize();
 		delete outFile;
 	}
-
-	return;
 }
 
 void SaveLoad_ns::getGamePartProgress(bool *complete, int size) {
@@ -353,19 +334,14 @@
 
 	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) {

Modified: scummvm/trunk/engines/parallaction/saveload.h
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.h	2011-01-25 01:28:31 UTC (rev 55509)
+++ scummvm/trunk/engines/parallaction/saveload.h	2011-01-25 01:58:26 UTC (rev 55510)
@@ -23,7 +23,6 @@
  *
  */
 
-
 #ifndef PARALLACTION_SAVELOAD_H
 #define PARALLACTION_SAVELOAD_H
 
@@ -31,9 +30,7 @@
 
 struct Character;
 
-
 class SaveLoad {
-
 protected:
 	Common::SaveFileManager	*_saveFileMan;
 	Common::String _saveFilePrefix;
@@ -60,7 +57,6 @@
 };
 
 class SaveLoad_ns : public SaveLoad {
-
 	Parallaction_ns *_vm;
 
 protected:
@@ -78,7 +74,6 @@
 };
 
 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 @@
 	virtual void setPartComplete(const char *part);
 };
 
-
 } // namespace Parallaction
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.