aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-01-01 14:42:03 +0200
committerEugene Sandulenko2014-01-01 14:42:03 +0200
commitba33bd4aedf2fc1a0a36e25e1f1b683a67d37b81 (patch)
tree0d830fe0511cedbb7a0deafbe2df2f5107da2bef
parenteca37854d5a3264200ed7e9dd0f62b054e40c716 (diff)
downloadscummvm-rg350-ba33bd4aedf2fc1a0a36e25e1f1b683a67d37b81.tar.gz
scummvm-rg350-ba33bd4aedf2fc1a0a36e25e1f1b683a67d37b81.tar.bz2
scummvm-rg350-ba33bd4aedf2fc1a0a36e25e1f1b683a67d37b81.zip
FULLPIPE: Implement sceneHandler16_showBearded()
-rw-r--r--engines/fullpipe/constants.h1
-rw-r--r--engines/fullpipe/objectnames.h2
-rw-r--r--engines/fullpipe/scenes/scene16.cpp7
3 files changed, 8 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 8b8664f2d2..c83da09334 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -663,6 +663,7 @@ namespace Fullpipe {
#define MV_GRL_FALL 3115
#define MV_GRL_LAUGH_POPA 3278
#define PIC_SC16_TUMBA 1368
+#define QU_BRD16_STARTBEARDED 4948
#define QU_SC16_GIRLLAUGH 1375
#define QU_SC16_SHOWMUG 1361
#define SND_16_034 3854
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 219f1b9d79..3f2f9b1071 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -176,7 +176,7 @@ namespace Fullpipe {
#define sO_IsDrinking "\xcf\xfc\xe5\xf2" // "Пьет"
#define sO_Broken "\xd0\xe0\xe7\xe1\xe8\xf2\xe0" // "Разбита"
#define sO_Unblocked "\xd0\xe0\xe7\xe1\xeb\xee\xea\xe8\xf0\xee\xe2\xe0\xed" // "Разблокирован"
-#define sO_Unfolded "\xd0\xe0\xe7\xe2\xe5\xf0\xed\xf3\xf2" // "Развернут"
+#define sO_Unconvoluted "\xd0\xe0\xe7\xe2\xe5\xf0\xed\xf3\xf2" // "Развернут"
#define sO_Jawcrucnher "\xd0\xee\xf2\xee\xf5\xf0\xf3\xf1" // "Ротохрус"
#define sO_UsherHand "\xd0\xf3\xea\xe0 \xc1\xe8\xeb\xe5\xf2\xe5\xf0\xf8\xe8" // "Рука Билетерши"
#define sO_LeverHandle_23 "\xd0\xf3\xea\xee\xff\xf2\xea\xe0 \xf0\xfb\xf7\xe0\xe3\xe0_23" // "Рукоятка рычага_23"
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 8129b2752b..de98276900 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -147,7 +147,12 @@ void sceneHandler16_laughSound() {
}
void sceneHandler16_showBearded() {
- warning("STUB: sceneHandler16_showBearded()");
+ if (g_fp->getObjectState(sO_Bridge) == g_fp->getObjectEnumState(sO_Bridge, sO_Unconvoluted)) {
+ StaticANIObject *brd = g_fp->_currentScene->getStaticANIObject1ById(ANI_BEARDED_CMN, -1);
+
+ if (!brd || !(brd->_flags & 4))
+ chainQueue(QU_BRD16_STARTBEARDED, 0);
+ }
}
void sceneHandler16_showMugFull() {