From ff20d914e9f97a753f831441aae1646ba1c3ad2d Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 3 Dec 2013 22:07:48 +0200
Subject: FULLPIPE: Implement sceneHandler04_takeBottle()

---
 engines/fullpipe/init.cpp           | 4 ++--
 engines/fullpipe/objectnames.h      | 2 +-
 engines/fullpipe/scenes/scene04.cpp | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp
index 49bf72ac91..eb109e11ec 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/fullpipe/init.cpp
@@ -65,7 +65,7 @@ void FullpipeEngine::initObjectStates() {
 	setObjectState(sO_Guardian, getObjectEnumState(sO_Guardian, sO_OnRight));
 	setObjectState(sO_Grandma, getObjectEnumState(sO_Grandma, sO_In_14));
 	setObjectState(sO_Boot_15, getObjectEnumState(sO_Boot_15, sO_NotPresent));
-	setObjectState(sO_LeftPipe_15, getObjectEnumState(sO_LeftPipe_15, sO_OpenedShe));
+	setObjectState(sO_LeftPipe_15, getObjectEnumState(sO_LeftPipe_15, sO_IsOpened));
 	setObjectState(sO_Pedestal_16, getObjectEnumState(sO_Pedestal_16, sO_IsFree));
 	setObjectState(sO_Cup, getObjectEnumState(sO_Cup, sO_InSmokeRoom));
 	setObjectState(sO_Pedestal_17, getObjectEnumState(sO_Pedestal_17, sO_IsFree));
@@ -84,7 +84,7 @@ void FullpipeEngine::initObjectStates() {
 	setObjectState(sO_Lever_23, getObjectEnumState(sO_Lever_23, sO_NotTaken));
 	setObjectState(sO_LeverHandle_23, getObjectEnumState(sO_LeverHandle_23, sO_WithoutStool));
 	setObjectState(sO_LowerPipe_21, getObjectEnumState(sO_LowerPipe_21, sO_IsClosed));
-	setObjectState(sO_StarsDown_24, getObjectEnumState(sO_StarsDown_24, sO_OpenedShe));
+	setObjectState(sO_StarsDown_24, getObjectEnumState(sO_StarsDown_24, sO_IsOpened));
 	setObjectState(sO_Hatch_26, getObjectEnumState(sO_Hatch_26, sO_Closed));
 	setObjectState(sO_Sock_26, getObjectEnumState(sO_Sock_26, sO_NotHanging));
 	setObjectState(sO_LeftPipe_26, getObjectEnumState(sO_LeftPipe_26, sO_IsClosed));
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 241e31b165..b8696ec672 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -148,7 +148,7 @@ namespace Fullpipe {
 #define sO_ClockAxis "\xce\xf1\xfc \xf7\xe0\xf1\xee\xe2"	// "Ось часов"
 #define sO_Opened "\xce\xf2\xea\xf0\xfb\xf2"	// "Открыт"
 #define sO_OpenedWithBoot "\xce\xf2\xea\xf0\xfb\xf2\xe0 \xf1 \xe1\xee\xf2\xe8\xed\xea\xee\xec"	// "Открыта с ботинком"
-#define sO_OpenedShe "\xce\xf2\xea\xf0\xfb\xf2\xe0"	// "Открыта"
+#define sO_IsOpened "\xce\xf2\xea\xf0\xfb\xf2\xe0"	// "Открыта"
 #define sO_WeirdWacko "\xce\xf2\xec\xee\xf0\xee\xe6\xe5\xed\xed\xfb\xe9"	// "Отмороженный"
 #define sO_NotPresent "\xce\xf2\xf1\xf3\xf2\xf1\xf2\xe2\xf3\xe5\xf2"	// "Отсутствует"
 #define sO_Error "\xce\xf8\xe8\xe1\xea\xe0"	// "Ошибка"
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 311bf86fc8..c025d41cbb 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -474,7 +474,10 @@ void sceneHandler04_sub17() {
 }
 
 void sceneHandler04_takeBottle() {
-	warning("sceneHandler04_takeBottle()");
+  g_vars->scene04_var02 = 1;
+  g_vars->scene04_hand->_priority = 5;
+
+  g_fullpipe->setObjectState(sO_LowerPipe, g_fullpipe->getObjectEnumState(sO_LowerPipe, sO_IsOpened));
 }
 
 void sceneHandler04_takeKozyawka() {
-- 
cgit v1.2.3