[Scummvm-cvs-logs] scummvm master -> 1c193ed1e5eb6372df181ed70913532d0dcc58f9

sev- sev at scummvm.org
Tue Mar 25 20:18:22 CET 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:
ae49c56c22 FULLPIPE: Implement sceneHandler29_manFromL()
a300c384d2 FULLPIPE: Implement sceneHandler29_manFromR()
d03ad2de56 FULLPIPE: Implement sceneHandler29_manToL()
1c193ed1e5 FULLPIPE: Implement sceneHandler29_manToR()


Commit: ae49c56c228e64bdb4308b49a139cfc8a0f8a01a
    https://github.com/scummvm/scummvm/commit/ae49c56c228e64bdb4308b49a139cfc8a0f8a01a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T21:08:19+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_manFromL()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 5e18723..b1c52d6 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1303,6 +1303,7 @@ namespace Fullpipe {
 #define MV_SHG_HITASS 2151
 #define MV_SHR_HITASS 2152
 #define PIC_SC29_LTRUBA 2081
+#define QU_SC29_MANFROM_L 2101
 #define SND_29_028 4758
 #define SND_29_029 4759
 #define ST_ASS_NORM 2122
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index ee6a159..c247b0f 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -220,7 +220,17 @@ void sceneHandler29_sub03() {
 }
 
 void sceneHandler29_manFromL() {
-	warning("STUB: sceneHandler29_manFromL()");
+	if (g_vars->scene29_var20 < 497 && !g_vars->scene29_var17) {
+		getCurrSceneSc2MotionController()->setEnabled();
+		getGameLoaderInteractionController()->enableFlag24();
+
+		g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
+		chainQueue(QU_SC29_MANFROM_L, 1);
+
+		g_vars->scene29_var17 = 1;
+
+		g_fp->_scrollSpeed = g_vars->scene29_var16;
+	}
 }
 
 void sceneHandler29_sub05() {


Commit: a300c384d20dbc7331cc0fd40a4aa661388c0450
    https://github.com/scummvm/scummvm/commit/a300c384d20dbc7331cc0fd40a4aa661388c0450
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T21:10:03+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_manFromR()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index b1c52d6..3763f77 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1304,6 +1304,7 @@ namespace Fullpipe {
 #define MV_SHR_HITASS 2152
 #define PIC_SC29_LTRUBA 2081
 #define QU_SC29_MANFROM_L 2101
+#define QU_SC29_MANFROM_R 2104
 #define SND_29_028 4758
 #define SND_29_029 4759
 #define ST_ASS_NORM 2122
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index c247b0f..6aa88b5 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -233,6 +233,16 @@ void sceneHandler29_manFromL() {
 	}
 }
 
+void sceneHandler29_manFromR() {
+	getCurrSceneSc2MotionController()->setEnabled();
+	getGameLoaderInteractionController()->enableFlag24();
+
+	chainQueue(QU_SC29_MANFROM_R, 1);
+
+	g_vars->scene29_var10 = 0;
+	g_vars->scene29_var12 = 0;
+}
+
 void sceneHandler29_sub05() {
 	warning("STUB: sceneHandler29_sub05()");
 }


Commit: d03ad2de560321d9db4ff915e322b663f3524d69
    https://github.com/scummvm/scummvm/commit/d03ad2de560321d9db4ff915e322b663f3524d69
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T21:14:21+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_manToL()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 3763f77..286e50b 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1305,6 +1305,7 @@ namespace Fullpipe {
 #define PIC_SC29_LTRUBA 2081
 #define QU_SC29_MANFROM_L 2101
 #define QU_SC29_MANFROM_R 2104
+#define QU_SC29_MANTO_L 2103
 #define SND_29_028 4758
 #define SND_29_029 4759
 #define ST_ASS_NORM 2122
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 6aa88b5..bc3fde8 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -243,6 +243,33 @@ void sceneHandler29_manFromR() {
 	g_vars->scene29_var12 = 0;
 }
 
+int sceneHandler29_updateScreenCallback() {
+	int res;
+
+	res = g_fp->drawArcadeOverlay(g_vars->scene29_var10);
+
+	if (!res)
+		g_fp->_updateScreenCallback = 0;
+
+	return res;
+}
+
+void sceneHandler29_manToL() {
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	chainQueue(QU_SC29_MANTO_L, 1);
+
+	g_vars->scene29_var10 = 1;
+
+	g_vars->scene29_mgm.addItem(g_fp->_aniMan->_id);
+
+	g_fp->_updateScreenCallback = sceneHandler29_updateScreenCallback;
+
+	g_fp->_msgY = -1;
+	g_fp->_msgX = -1;
+}
+
 void sceneHandler29_sub05() {
 	warning("STUB: sceneHandler29_sub05()");
 }


Commit: 1c193ed1e5eb6372df181ed70913532d0dcc58f9
    https://github.com/scummvm/scummvm/commit/1c193ed1e5eb6372df181ed70913532d0dcc58f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T21:16:01+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_manToR()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 286e50b..6dc3685 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1306,6 +1306,7 @@ namespace Fullpipe {
 #define QU_SC29_MANFROM_L 2101
 #define QU_SC29_MANFROM_R 2104
 #define QU_SC29_MANTO_L 2103
+#define QU_SC29_MANTO_R 2100
 #define SND_29_028 4758
 #define SND_29_029 4759
 #define ST_ASS_NORM 2122
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index bc3fde8..5d885a5 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -270,6 +270,22 @@ void sceneHandler29_manToL() {
 	g_fp->_msgX = -1;
 }
 
+void sceneHandler29_manToR() {
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	chainQueue(QU_SC29_MANTO_R, 1);
+
+	g_vars->scene29_var09 = 1;
+	g_fp->_msgY = -1;
+	g_fp->_msgX = -1;
+
+	g_vars->scene29_var17 = 0;
+
+	g_vars->scene29_var16 = g_fp->_scrollSpeed;
+	g_fp->_scrollSpeed = 4;
+}
+
 void sceneHandler29_sub05() {
 	warning("STUB: sceneHandler29_sub05()");
 }






More information about the Scummvm-git-logs mailing list