aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-12-24 00:14:13 +0200
committerEugene Sandulenko2013-12-24 00:14:37 +0200
commit4eec1a491c31ff0c98457d5f248b583b52964b38 (patch)
tree339bc2aecf2dcc038575e12610684285fb9e9858 /engines
parent51a83e8be1f9ca9ea755cfe8b253b0aa0b9d5769 (diff)
downloadscummvm-rg350-4eec1a491c31ff0c98457d5f248b583b52964b38.tar.gz
scummvm-rg350-4eec1a491c31ff0c98457d5f248b583b52964b38.tar.bz2
scummvm-rg350-4eec1a491c31ff0c98457d5f248b583b52964b38.zip
FULLPIPE: Implement scene11_setupMusic()
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/init.cpp2
-rw-r--r--engines/fullpipe/objectnames.h2
-rw-r--r--engines/fullpipe/scenes.cpp2
-rw-r--r--engines/fullpipe/scenes/scene11.cpp5
4 files changed, 8 insertions, 3 deletions
diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp
index 8526c2114b..4cf5fbef61 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/fullpipe/init.cpp
@@ -60,7 +60,7 @@ void FullpipeEngine::initObjectStates() {
setObjectState(sO_Pipe_9, getObjectEnumState(sO_Pipe_9, sO_WithJug));
setObjectState(sO_Inflater, getObjectEnumState(sO_Inflater, sO_WithGum));
setObjectState(sO_Swingie, getObjectEnumState(sO_Swingie, sO_IsSwinging));
- setObjectState(sO_DudeJumped, getObjectEnumState(sO_DudeJumped, sO_No));
+ setObjectState(sO_DudeHasJumped, getObjectEnumState(sO_DudeHasJumped, sO_No));
setObjectState(sO_Bridge, getObjectEnumState(sO_Bridge, sO_Convoluted));
setObjectState(sO_Guardian, getObjectEnumState(sO_Guardian, sO_OnRight));
setObjectState(sO_Grandma, getObjectEnumState(sO_Grandma, sO_In_14));
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index b4564d4c5d..07526d0a35 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -78,7 +78,7 @@ namespace Fullpipe {
#define sO_Grandpa "\xc4\xe5\xe4\xf3\xf8\xea\xe0" // "Дедушка"
#define sO_Plank_25 "\xc4\xee\xf1\xea\xe0_25" // "Доска_25"
#define sO_Plank_34 "\xc4\xee\xf1\xea\xe0_34" // "Доска_34"
-#define sO_DudeJumped "\xc4\xff\xe4\xff \xef\xf0\xfb\xe3\xe0\xeb" // "Дядя прыгал"
+#define sO_DudeHasJumped "\xc4\xff\xe4\xff \xef\xf0\xfb\xe3\xe0\xeb" // "Дядя прыгал"
#define sO_Dude "\xc4\xff\xe4\xff" // "Дядя"
#define sO_GuvTheDrawer "\xc4\xff\xe4\xff-\xff\xf9\xe8\xea" // "Дядя-ящик"
#define sO_DudeSwinged "\xc4\xff\xe4\xff_\xea\xe0\xf2\xe0\xeb\xf1\xff" // "Дядя_катался"
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 341913ba6b..921cdfd1d1 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -427,7 +427,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene->initObjectCursors("SC_11");
setSceneMusicParameters(sceneVar);
insertMessageHandler(sceneHandler11, 2, 2);
- scene11_sub_41A980();
+ scene11_setupMusic();
_updateCursorCallback = scene11_updateCursor;
break;
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 7ac92c7cf3..d38bc9cee1 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -40,6 +40,11 @@ void scene11_dudeSwingCallback(int *arg) {
warning("STUB: scene11_dudeSwingCallback()");
}
+void scene11_setupMusic() {
+ if (g_fp->getObjectState(sO_DudeHasJumped) == g_fp->getObjectEnumState(sO_DudeHasJumped, sO_Yes))
+ g_fp->playTrack(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_11"), "MUSIC2", 1);
+}
+
void scene11_initScene(Scene *sc) {
g_vars->scene11_swingie = sc->getStaticANIObject1ById(ANI_SWINGER, -1);
g_vars->scene11_boots = sc->getStaticANIObject1ById(ANI_BOOTS_11, -1);