[Scummvm-cvs-logs] scummvm master -> 085c53b0ec75f8f68ff2634c62ea0f08c5e78340

[sev-]

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

Summary:
b39086861e FULLPIPE: Implement sceneHandler27_driverPushButton()
085c53b0ec FULLPIPE: Implement sceneHandler27_maidSwitchback()


Commit: b39086861e2303c99c4c62a711993bcbf700b25c
    https://github.com/scummvm/scummvm/commit/b39086861e2303c99c4c62a711993bcbf700b25c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-07T14:21:17-08:00

Commit Message:
FULLPIPE: Implement sceneHandler27_driverPushButton()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index f1d2d87..451cc9c 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1105,6 +1105,8 @@ namespace Fullpipe {
 #define MV_MAN27_THROWBET 1989
 #define PIC_SC27_HITZONE2 4756
 #define QU_DRV_GIVEVENT 2040
+#define QU_DRV_PUSHBUTTON 2056
+#define QU_DRV_PUSHBUTTON_NOVENT 4578
 #define QU_MID_CLEANVENT 4583
 #define QU_SC27_RESTARTBETS 3370
 #define QU_SC27_SHOWBET 3368
@@ -1119,6 +1121,7 @@ namespace Fullpipe {
 #define ST_BTH_3 3361
 #define ST_BTH_4 3359
 #define ST_BTH_5 3357
+#define ST_DRV_SITNOVENT 1999
 #define ST_DRV_VENT 1996
 #define ST_MID_BROOM 2022
 #define ST_MID_SPADE 3489
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 407cf38..ba18c90 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -442,7 +442,19 @@ void sceneHandler27_batSetColors(int batn) {
 }
 
 void sceneHandler27_driverPushButton() {
-	warning("STUB: sceneHandler27_driverPushButton()");
+	if (g_fp->getObjectState(sO_Driver) == g_fp->getObjectEnumState(sO_Driver, sO_WithSteering)) {
+		g_vars->scene27_driver->changeStatics2(ST_DRV_VENT);
+		chainQueue(QU_DRV_PUSHBUTTON, 1);
+
+		g_vars->scene27_var11 = 1;
+	} else {
+		g_vars->scene27_driver->changeStatics2(ST_DRV_SITNOVENT);
+
+
+		chainQueue(QU_DRV_PUSHBUTTON_NOVENT, 1);
+
+		g_vars->scene27_var11 = 1;
+	}
 }
 
 void sceneHandler27_maidSwitchback() {


Commit: 085c53b0ec75f8f68ff2634c62ea0f08c5e78340
    https://github.com/scummvm/scummvm/commit/085c53b0ec75f8f68ff2634c62ea0f08c5e78340
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-07T14:21:17-08:00

Commit Message:
FULLPIPE: Implement sceneHandler27_maidSwitchback()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 451cc9c..4d63031 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1108,6 +1108,7 @@ namespace Fullpipe {
 #define QU_DRV_PUSHBUTTON 2056
 #define QU_DRV_PUSHBUTTON_NOVENT 4578
 #define QU_MID_CLEANVENT 4583
+#define QU_MID_SWITCHBACK 2044
 #define QU_SC27_RESTARTBETS 3370
 #define QU_SC27_SHOWBET 3368
 #define SND_27_026 4127
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index ba18c90..20e6850 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -458,7 +458,10 @@ void sceneHandler27_driverPushButton() {
 }
 
 void sceneHandler27_maidSwitchback() {
-	warning("STUB: sceneHandler27_maidSwitchback()");
+	if (g_fp->getObjectState(sO_Maid) == g_fp->getObjectEnumState(sO_Maid, sO_WithSwab)) {
+		g_vars->scene27_maid->changeStatics2(ST_MID_SWAB);
+		g_vars->scene27_maid->startMQIfIdle(QU_MID_SWITCHBACK, 1);
+	}
 }
 
 void sceneHandler27_batLogic() {