[Scummvm-cvs-logs] scummvm master -> de9ab9d088d545835c983df5966c167d757a895f

[sev-]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a3859041bf FULLPIPE: Implement ModalSaveGame::ModalSaveGame()
d5bc560d66 FULLPIPE: Implement ModalSaveGame destructor
91a3839882 FULLPIPE: Implement ModalSaveGame::getSaveName()
de9ab9d088 FULLPIPE: More code to ModalSaveGame


Commit: a3859041bf492a2c926dadc7324c1fe811fbbf86
    https://github.com/scummvm/scummvm/commit/a3859041bf492a2c926dadc7324c1fe811fbbf86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-27T12:37:48+03:00

Commit Message:
FULLPIPE: Implement ModalSaveGame::ModalSaveGame()

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 65274bf..79d348c 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1446,10 +1446,20 @@ bool ModalQuery::init(int counterdiff) {
 }
 
 ModalSaveGame::ModalSaveGame() {
-	warning("STUB: ModalSaveGame::ModalSaveGame()");
-
 	_oldBgX = 0;
 	_oldBgY = 0;
+
+	_bgr = 0;
+	_okD = 0;
+	_okL = 0;
+	_cancelD = 0;
+	_cancelL = 0;
+	_emptyD = 0;
+	_emptyL = 0;
+	_queryRes = -1;
+	_rect = g_fp->_sceneRect;
+	_queryDlg = 0;
+	_mode = 1;
 }
 
 void ModalSaveGame::setScene(Scene *sc) {
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index f726405..15f89d6 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -251,9 +251,26 @@ public:
 	void setScene(Scene *sc);
 	void setup(Scene *sc, int mode);
 
+
 	Common::Rect _rect;
 	int _oldBgX;
 	int _oldBgY;
+	PictureObject *_bgr;
+	PictureObject *_okD;
+	PictureObject *_okL;
+	PictureObject *_cancelD;
+	PictureObject *_cancelL;
+	PictureObject *_emptyD;
+	PictureObject *_emptyL;
+	PictureObject *_fullD;
+	PictureObject *_fullL;
+	Scene *_menuScene;
+	int _mode;
+	ModalQuery *_queryDlg;
+	Common::Array <char *> _filenames;
+	Common::Array <PictureObject *> _arrayL;
+	Common::Array <PictureObject *> _arrayD;
+	int _queryRes;
 };
 
 


Commit: d5bc560d66dc90bf0223bfe862fd3334c2cd4b1e
    https://github.com/scummvm/scummvm/commit/d5bc560d66dc90bf0223bfe862fd3334c2cd4b1e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-27T12:39:37+03:00

Commit Message:
FULLPIPE: Implement ModalSaveGame destructor

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 79d348c..1fe12b9 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1462,6 +1462,14 @@ ModalSaveGame::ModalSaveGame() {
 	_mode = 1;
 }
 
+ModalSaveGame::~ModalSaveGame() {
+	g_fp->_sceneRect = _rect;
+
+	_arrayD.clear();
+	_arrayL.clear();
+	_filenames.clear();
+}
+
 void ModalSaveGame::setScene(Scene *sc) {
 	warning("STUB: ModalSaveGame::setScene()");
 }
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 15f89d6..435e1fd 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -240,7 +240,7 @@ private:
 class ModalSaveGame : public BaseModalObject {
 public:
 	ModalSaveGame();
-	virtual ~ModalSaveGame() {}
+	virtual ~ModalSaveGame();
 
 	virtual bool pollEvent() { return true; }
 	virtual bool handleMessage(ExCommand *message) { return false; }


Commit: 91a38398825190a2f1ee0e4b104a369b90f9f2c1
    https://github.com/scummvm/scummvm/commit/91a38398825190a2f1ee0e4b104a369b90f9f2c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-27T12:42:28+03:00

Commit Message:
FULLPIPE: Implement ModalSaveGame::getSaveName()

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 1fe12b9..4d71f4e 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1467,6 +1467,10 @@ ModalSaveGame::~ModalSaveGame() {
 
 	_arrayD.clear();
 	_arrayL.clear();
+
+	for (uint i = 0; i < _filenames.size(); i++)
+		free(_filenames[i]);
+
 	_filenames.clear();
 }
 
@@ -1478,6 +1482,14 @@ void ModalSaveGame::setup(Scene *sc, int mode) {
 	warning("STUB: ModalSaveGame::setup()");
 }
 
+char *ModalSaveGame::getSaveName() {
+	if (_queryRes < 0)
+		return 0;
+
+	return _filenames[_queryRes];
+}
+
+
 void FullpipeEngine::openHelp() {
 	if (!_modalObject) {
 		ModalHelp *help = new ModalHelp;
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 435e1fd..4748041 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -251,6 +251,7 @@ public:
 	void setScene(Scene *sc);
 	void setup(Scene *sc, int mode);
 
+	char *getSaveName();
 
 	Common::Rect _rect;
 	int _oldBgX;


Commit: de9ab9d088d545835c983df5966c167d757a895f
    https://github.com/scummvm/scummvm/commit/de9ab9d088d545835c983df5966c167d757a895f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-27T12:52:57+03:00

Commit Message:
FULLPIPE: More code to ModalSaveGame

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 4d71f4e..36dd006 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1475,7 +1475,13 @@ ModalSaveGame::~ModalSaveGame() {
 }
 
 void ModalSaveGame::setScene(Scene *sc) {
-	warning("STUB: ModalSaveGame::setScene()");
+	_queryRes = -1;
+	_menuScene = sc;
+}
+
+void ModalSaveGame::processKey(int key) {
+	if (key == 27)
+		_queryRes = 0;
 }
 
 void ModalSaveGame::setup(Scene *sc, int mode) {
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 4748041..bd6cc18 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -250,6 +250,7 @@ public:
 
 	void setScene(Scene *sc);
 	void setup(Scene *sc, int mode);
+	void processKey(int key);
 
 	char *getSaveName();