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

sev- sev at scummvm.org
Wed Jun 18 08:38:43 CEST 2014


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:
5a8b613a97 FULLPIPE: Stubbed sceneFade()
c2387dbf3c FULLPIPE: Implemented ModalIntro::update()
fde3e7fc12 FULLPIPE: Implement ModalCredits::update()
a3e89eb4b2 FULLPIPE: Fixed ModalQuery


Commit: 5a8b613a97c63a3cb354f05eab6a5460d4ea45a6
    https://github.com/scummvm/scummvm/commit/5a8b613a97c63a3cb354f05eab6a5460d4ea45a6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-18T09:37:36+03:00

Commit Message:
FULLPIPE: Stubbed sceneFade()

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



diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 394f6a0..7f20a6d 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -243,6 +243,7 @@ public:
 	int (*_updateCursorCallback)();
 
 	void drawAlphaRectangle(int x1, int y1, int x2, int y2, int alpha);
+	void sceneFade(Scene *sc, bool direction);
 
 	int _cursorId;
 	int _minCursorId;
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 2bed8a8..2615648 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -1256,4 +1256,23 @@ void FullpipeEngine::drawAlphaRectangle(int x1, int y1, int x2, int y2, int alph
 	warning("STUB: FullpipeEngine::drawAlphaRectangle()");
 }
 
+void FullpipeEngine::sceneFade(Scene *sc, bool direction) {
+	warning("STUB: FullpipeEngine::sceneFade()");
+
+#if 0
+	for (int dim = 0; dim < 255; dim += 20) {
+		v5 = GetTickCount();
+		vrtSetAlphaBlendMode(*(_DWORD *)virt, 0, 255);
+		sc->draw();
+		drawAlphaRectangle(0, 0, 800, 600, direction ? 255 - dim : dim);
+		vrtFlush(*(_DWORD *)virt);
+		v7 = GetTickCount();
+		if ( v7 - v5 < 42 )
+			Sleep(v5 - v7 + 42);
+	}
+    vrtSetAlphaBlendMode(*(_DWORD *)virt, 0, 255);
+#endif
+
+}
+
 } // End of namespace Fullpipe


Commit: c2387dbf3c938a11f735a715db5f9744c2400473
    https://github.com/scummvm/scummvm/commit/c2387dbf3c938a11f735a715db5f9744c2400473
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-18T09:37:36+03:00

Commit Message:
FULLPIPE: Implemented ModalIntro::update()

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6f99200..6777ed98 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -198,11 +198,9 @@ bool ModalIntro::init(int counterdiff) {
 }
 
 void ModalIntro::update() {
-	warning("STUB: ModalIntro::update()");
-
 	if (g_fp->_currentScene) {
 		if (_introFlags & 1) {
-			//sceneFade(virt, g_currentScene, 1);
+			g_fp->sceneFade(g_fp->_currentScene, true);
 			_stillRunning = 255;
 			_introFlags &= 0xfe;
 
@@ -210,12 +208,12 @@ void ModalIntro::update() {
 				g_fp->playSound(SND_INTR_019, 0);
 		} else if (_introFlags & 2) {
 			if (g_vars->sceneIntro_needBlackout) {
-				//vrtRectangle(*(_DWORD *)virt, 0, 0, 0, 800, 600);
+				g_fp->drawAlphaRectangle(0, 0, 800, 600, 0);
 				g_vars->sceneIntro_needBlackout = 0;
 				_stillRunning = 0;
 				_introFlags &= 0xfd;
 			} else {
-				//sceneFade(virt, g_currentScene, 0);
+				g_fp->sceneFade(g_fp->_currentScene, false);
 				_stillRunning = 0;
 				_introFlags &= 0xfd;
 			}


Commit: fde3e7fc128a75b5f5c0c091588a0c02ab64098e
    https://github.com/scummvm/scummvm/commit/fde3e7fc128a75b5f5c0c091588a0c02ab64098e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-18T09:37:36+03:00

Commit Message:
FULLPIPE: Implement ModalCredits::update()

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6777ed98..8e04e31 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -726,8 +726,6 @@ bool ModalCredits::init(int counterdiff) {
 }
 
 void ModalCredits::update() {
-	warning("STUB: ModalCredits::update()");
-
 	if (_fadeOut) {
 		if (_fadeIn) {
 			_sceneTitles->draw();
@@ -735,14 +733,14 @@ void ModalCredits::update() {
 			return;
 		}
 	} else if (_fadeIn) {
-		//sceneFade(virt, this->_sceneTitles, 1); // TODO
+		g_fp->sceneFade(_sceneTitles, true);
 		_fadeOut = 1;
 
 		return;
 	}
 
 	if (_fadeOut) {
-		//sceneFade(virt, this->_sceneTitles, 0); // TODO
+		g_fp->sceneFade(_sceneTitles, false);
 		_fadeOut = 0;
 		return;
 	}


Commit: a3e89eb4b20bf0213a9204e88f1772f1e778574f
    https://github.com/scummvm/scummvm/commit/a3e89eb4b20bf0213a9204e88f1772f1e778574f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-18T09:37:37+03:00

Commit Message:
FULLPIPE: Fixed ModalQuery

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



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 8e04e31..2fd7ef0 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -918,7 +918,7 @@ bool ModalMainMenu::init(int counterdiff) {
 			g_fp->_modalObject = mq;
 
 			mq->_parentObj = this;
-			mq->create(_scene, (PictureObject *)_scene->_picObjList[0], PIC_MEX_BGR);
+			mq->create(_scene, _scene, PIC_MEX_BGR);
 
 			_hoverAreaId = 0;
 
@@ -1318,7 +1318,7 @@ void ModalHelp::launch() {
 }
 
 ModalQuery::ModalQuery() {
-	_picObjList = 0;
+	_bgScene = 0;
 	_bg = 0;
 	_okBtn = 0;
 	_cancelBtn = 0;
@@ -1331,7 +1331,7 @@ ModalQuery::~ModalQuery() {
 	_okBtn->_flags &= 0xFFFB;
 }
 
-bool ModalQuery::create(Scene *sc, PictureObject *picObjList, int id) {
+bool ModalQuery::create(Scene *sc, Scene *bgScene, int id) {
 	if (id == PIC_MEX_BGR) {
 		_bg = sc->getPictureObjectById(PIC_MEX_BGR, 0);
 
@@ -1368,14 +1368,14 @@ bool ModalQuery::create(Scene *sc, PictureObject *picObjList, int id) {
 	}
 
 	_queryResult = -1;
-	_picObjList = picObjList;
+	_bgScene = bgScene;
 
 	return true;
 }
 
 void ModalQuery::update() {
-	if (_picObjList)
-		_picObjList->draw();
+	if (_bgScene)
+		_bgScene->draw();
 
 	_bg->draw();
 
@@ -1426,9 +1426,12 @@ bool ModalQuery::init(int counterdiff) {
 			_okBtn->_flags &= 0xFFFB;
 
 			if (_queryResult == 1) {
+				if (_bgScene)
+					g_fp->sceneFade(_bgScene, false);
+
 				warning("STUB: ModalQuery::init()");
-				//sceneFade(g_vrtDrawHandle, (Scene *)this->_picObjList, 0);
 
+				// Quit game
 				//if (inputArFlag) {
 				//	g_needRestart = 1;
 				//	return 0;
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 01d8e6b..a08cb3b 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -235,12 +235,12 @@ public:
 	virtual void update();
 	virtual void saveload() {}
 
-	bool create(Scene *sc, PictureObject *picObjList, int picId);
+	bool create(Scene *sc, Scene *bgScene, int picId);
 	int getQueryResult() { return _queryResult; }
 
 
 private:
-	PictureObject *_picObjList;
+	Scene *_bgScene;
 	PictureObject *_bg;
 	PictureObject *_okBtn;
 	PictureObject *_cancelBtn;






More information about the Scummvm-git-logs mailing list