[Scummvm-cvs-logs] scummvm master -> e9b174273876122bb5fed6e63384480298f3d34d
sev-
sev at scummvm.org
Mon Nov 25 06:19:38 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e9b1742738 FULLPIPE: Implement sceneHandler04_clickButton()
Commit: e9b174273876122bb5fed6e63384480298f3d34d
https://github.com/scummvm/scummvm/commit/e9b174273876122bb5fed6e63384480298f3d34d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-24T21:17:38-08:00
Commit Message:
FULLPIPE: Implement sceneHandler04_clickButton()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 53eec3a..edc956d 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -26,6 +26,7 @@
namespace Fullpipe {
#define ANI_BOOT_1 4231
+#define ANI_BUTTON 598
#define ANI_CLOCK 588
#define ANI_DOMINO_3 2732
#define ANI_DADAYASHIK 306
@@ -109,6 +110,9 @@ namespace Fullpipe {
#define MV_KZW_JUMP 558
#define MV_KZW_JUMPROTATE 561
#define MV_BDG_OPEN 1379
+#define MV_BTN_CLICK 599
+#define MV_CLK_GO 589
+#define MV_HND_POINT 602
#define MV_MAN_GOD 481
#define MV_MAN_GOLADDER 451
#define MV_MAN_GOLADDER2 2844
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 01069ea..d658be5 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -222,7 +222,18 @@ void sceneHandler04_clickBottle() {
}
void sceneHandler04_clickButton() {
- warning("sceneHandler04_clickButton()");
+ StaticANIObject *but = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BUTTON, -1);
+
+ if (but) {
+ if (!g_vars->scene04_clock->_movement ||
+ (g_vars->scene04_clock->_movement->_id == MV_CLK_GO && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex > 3 &&
+ g_vars->scene04_clock->_movement->_currDynamicPhaseIndex < 105)) {
+ if (!g_vars->scene04_hand->_movement && !g_vars->scene04_var02) {
+ but->startAnim(MV_BTN_CLICK, 0, -1);
+ g_vars->scene04_hand->startAnim(MV_HND_POINT, 0, -1);
+ }
+ }
+ }
}
void sceneHandler04_clickLadder() {
More information about the Scummvm-git-logs
mailing list