[Scummvm-cvs-logs] scummvm master -> 51c0f0e6971c43d210f985c8a5ae5d857fbf6f2a

[sev-]

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:
51c0f0e697 FULLPIPE: Complete sceneHandler38_animateAlcoholics()


Commit: 51c0f0e6971c43d210f985c8a5ae5d857fbf6f2a
    https://github.com/scummvm/scummvm/commit/51c0f0e6971c43d210f985c8a5ae5d857fbf6f2a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-21T13:17:59-08:00

Commit Message:
FULLPIPE: Complete sceneHandler38_animateAlcoholics()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 1d1dbee..9e79b1c 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1314,14 +1314,36 @@ namespace Fullpipe {
 #define MV_DMS_FOUR 3322
 #define MV_DMS_THREE 3321
 #define MV_GLV_LOOKMAN 2167
+#define ST_BTL38_FULL 3172
+#define ST_DMN38_6 2288
+#define ST_DMN38_NORM3 2251
+#define ST_DMN38_NORM4 2253
 #define ST_DMS_3 3319
 #define ST_DMS_4 3320
 #define ST_GLV_HAMMER 2156
 #define ST_GLV_NOHAMMER 2159
+#define ST_GLV_SLEEP2 2166
 #define ST_MLS_LEFT2 2291
+#define ST_MLS_RIGHT2 3323
+#define QU_DLD_BLINK 2216
 #define QU_DLD_DENY 2218
+#define QU_DLD_GLOT 2217
+#define QU_DLD_ICK 2219
+#define QU_DLD_TAKE1 2214
+#define QU_DLD_TAKE2 2215
+#define QU_GLV_DRINK 2210
+#define QU_GLV_DRINKBOTTLE 2286
+#define QU_GLV_DRINK_NOHMR 2211
+#define QU_GLV_HMRKICK 2207
+#define QU_GLV_PROPOSE 2280
+#define QU_GLV_PROPOSE_NOHMR 2281
+#define QU_GLV_TAKEDOMINO 2170
+#define QU_GLV_TAKEDOMINO_NOHMR 3182
 #define QU_GLV_TOSMALL 2208
 #define QU_GLV_TOSMALL_NOHMR 2209
+#define QU_MLS_BLINK 2222
+#define QU_MLS_HAND 2223
+#define QU_MLS_TURNL 2220
 #define QU_MLS_TURNR 2221
 #define QU_SC38_SHOWBOTTLE 2199
 #define QU_SC38_SHOWBOTTLE_ONTABLE 2838
diff --git a/engines/fullpipe/scenes/scene38.cpp b/engines/fullpipe/scenes/scene38.cpp
index 22ae370..e6f9f6f 100644
--- a/engines/fullpipe/scenes/scene38.cpp
+++ b/engines/fullpipe/scenes/scene38.cpp
@@ -163,9 +163,6 @@ void sceneHandler38_drink() {
 }
 
 void sceneHandler38_animateAlcoholics() {
-	warning("STUB: sceneHandler38_animateAlcoholics()");
-
-#if 0
 	MessageQueue *mq;
 
 	if (g_vars->scene38_boss->_movement || !(g_vars->scene38_boss->_flags & 4) || (g_vars->scene38_boss->_flags & 2)) {
@@ -323,7 +320,6 @@ void sceneHandler38_animateAlcoholics() {
 
 		g_vars->scene38_var11 = 0;
 	}
-#endif
 }
 
 int sceneHandler38(ExCommand *cmd) {