Pushed current save/load code from Parallaction down to Parallaction_ns.

svn-id: r28775

3 files changed, 22 insertions, 37 deletions

diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 8bd42bc6c1..a2f52575f6 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -39,10 +39,6 @@
 #include "parallaction/disk.h"
 #include "parallaction/walk.h"
 
-namespace GUI {
-	class ListWidget;
-	class CommandSender;
-}
 
 extern OSystem *g_system;
 
@@ -368,8 +364,8 @@ public:
 
 	int init();
 
-	void loadGame();
-	void saveGame();
+	virtual void loadGame() = 0;
+	virtual void saveGame() = 0;
 
 	uint16 		updateInput();
 
@@ -537,11 +533,6 @@ protected:		// members
 	InputData 	*translateInput();
 	void		processInput(InputData*);
 
-	int         buildSaveFileList(Common::StringList& l);
-	int         selectSaveFile(uint16 arg_0, const char* caption, const char* button);
-	void		doLoadGame(uint16 slot);
-	void		doSaveGame(uint16 slot, const char* name);
-
 	void		doLocationEnterTransition();
 	virtual void changeLocation(char *location) = 0;
 	virtual void changeCharacter(const char *name) = 0;
@@ -598,6 +589,10 @@ public:
 	void renderLabel(Graphics::Surface *cnv, char *text);
 	void setMousePointer(int16 index);
 
+	void loadGame();
+	void saveGame();
+
+
 private:
 	Menu*			_menu;
 
@@ -608,6 +603,11 @@ private:
 	void changeLocation(char *location);
 	void changeCharacter(const char *name);
 
+	void doLoadGame(uint16 slot);
+	void doSaveGame(uint16 slot, const char* name);
+	int  buildSaveFileList(Common::StringList& l);
+	int  selectSaveFile(uint16 arg_0, const char* caption, const char* button);
+
 	void initResources();
 	void initCursors();
 
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 279dbda1b9..299eba18a3 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -47,8 +47,6 @@
 namespace Parallaction {
 
 
-extern char _gameNames[][20];
-
 
 class SaveLoadChooser : public GUI::Dialog {
 	typedef Common::String String;
@@ -61,12 +59,12 @@ protected:
 	GUI::StaticTextWidget	*_time;
 	GUI::StaticTextWidget	*_playtime;
 	GUI::ContainerWidget	*_container;
-	Parallaction			*_vm;
+	Parallaction_ns			*_vm;
 
 	uint8 _fillR, _fillG, _fillB;
 
 public:
-	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
+	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction_ns *engine);
 	~SaveLoadChooser();
 
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
@@ -80,7 +78,7 @@ public:
 
 
 
-void Parallaction::doLoadGame(uint16 slot) {
+void Parallaction_ns::doLoadGame(uint16 slot) {
 
 	_introSarcData3 = 200;
 	_introSarcData2 = 1;
@@ -179,7 +177,7 @@ void Parallaction::doLoadGame(uint16 slot) {
 }
 
 
-void Parallaction::doSaveGame(uint16 slot, const char* name) {
+void Parallaction_ns::doSaveGame(uint16 slot, const char* name) {
 
 	char path[PATH_LEN];
 	sprintf(path, "game.%i", slot);
@@ -251,8 +249,7 @@ enum {
 };
 
 
-
-SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine)
+SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction_ns *engine)
 	: Dialog("scummsaveload"), _list(0), _chooseButton(0), _gfxWidget(0), _vm(engine) {
 
 //	_drawingHints |= GUI::THEME_HINT_SPECIAL_COLOR;
@@ -340,7 +337,7 @@ void SaveLoadChooser::reflowLayout() {
 	Dialog::reflowLayout();
 }
 
-int Parallaction::buildSaveFileList(Common::StringList& l) {
+int Parallaction_ns::buildSaveFileList(Common::StringList& l) {
 
 	char name[16];
 	char buf[30];
@@ -367,7 +364,7 @@ int Parallaction::buildSaveFileList(Common::StringList& l) {
 }
 
 
-int Parallaction::selectSaveFile(uint16 arg_0, const char* caption, const char* button) {
+int Parallaction_ns::selectSaveFile(uint16 arg_0, const char* caption, const char* button) {
 
 	SaveLoadChooser* slc = new SaveLoadChooser(caption, button, this);
 
@@ -388,7 +385,7 @@ int Parallaction::selectSaveFile(uint16 arg_0, const char* caption, const char*
 
 
 
-void Parallaction::loadGame() {
+void Parallaction_ns::loadGame() {
 
 	int _di = selectSaveFile( 0, "Load file", "Load" );
 	if (_di == -1) {
@@ -406,7 +403,7 @@ void Parallaction::loadGame() {
 }
 
 
-void Parallaction::saveGame() {
+void Parallaction_ns::saveGame() {
 
 	if (!scumm_stricmp(_location._name, "caveau"))
 		return;
diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp
index 8fa1b9f5e4..c3775dd4fa 100644
--- a/engines/parallaction/staticres.cpp
+++ b/engines/parallaction/staticres.cpp
@@ -249,19 +249,6 @@ const char *_zoneTypeNamesRes_ns[] = {
 	"Command"
 };
 
-const char _gameNames[10][20] = {
-	"GAME1",
-	"GAME2",
-	"GAME3",
-	"GAME4",
-	"GAME5",
-	"GAME6",
-	"GAME7",
-	"GAME8",
-	"GAME9",
-	"GAME10"
-};
-
 const char *_commandsNamesRes_ns[] = {
 	"set",
 	"clear",
@@ -436,7 +423,8 @@ const char *_instructionNamesRes_br[] = {
 	"div",
 	"if",
 	"endif",
-	"stop"
+	"stop",
+	"endscript"
 };
 
 const char *_commandsNamesRes_br[] = {