diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/init.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/objectnames.h | 8 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene27.cpp | 125 |
3 files changed, 130 insertions, 5 deletions
diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp index 8de37b5c9e..fd90db9e0f 100644 --- a/engines/fullpipe/init.cpp +++ b/engines/fullpipe/init.cpp @@ -96,7 +96,7 @@ void FullpipeEngine::initObjectStates() { setObjectState(sO_Pool, getObjectEnumState(sO_Pool, sO_Overfull)); setObjectState(sO_Board_25, getObjectEnumState(sO_Board_25, sO_NearDudesStairs)); setObjectState(sO_Driver, getObjectEnumState(sO_Driver, sO_WithSteering)); - setObjectState(sO_Janitress, getObjectEnumState(sO_Janitress, sO_WithMop)); + setObjectState(sO_Maid, getObjectEnumState(sO_Maid, sO_WithSwab)); setObjectState(sO_LeftPipe_29, getObjectEnumState(sO_LeftPipe_29, sO_IsClosed)); setObjectState(sO_LeftPipe_30, getObjectEnumState(sO_LeftPipe_30, sO_IsClosed)); setObjectState(sO_Leg, getObjectEnumState(sO_Leg, sO_ShowingHeel)); diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h index eafdb2a8e7..a3718519ca 100644 --- a/engines/fullpipe/objectnames.h +++ b/engines/fullpipe/objectnames.h @@ -192,7 +192,7 @@ namespace Fullpipe { #define sO_WithPlunger "\xd1 \xe2\xe0\xed\xf2\xf3\xe7\xee\xec" // "С вантузом" #define sO_WithJug "\xd1 \xe3\xee\xf0\xf8\xea\xee\xec" // "С горшком" #define sO_WithGum "\xd1 \xe6\xe2\xe0\xf7\xea\xee\xe9" // "С жвачкой" -#define sO_WithShovel "\xd1 \xeb\xee\xef\xe0\xf2\xee\xe9" // "С лопатой" +#define sO_WithSpade "\xd1 \xeb\xee\xef\xe0\xf2\xee\xe9" // "С лопатой" #define sO_WithSmall "\xd1 \xec\xe0\xeb\xfb\xec" // "С малым" #define sO_WithHammer "\xd1 \xec\xee\xeb\xee\xf2\xea\xee\xec" // "С молотком" #define sO_WithCoin "\xd1 \xec\xee\xed\xe5\xf2\xee\xe9" // "С монетой" @@ -208,9 +208,9 @@ namespace Fullpipe { #define sO_IsSitting "\xd1\xe8\xe4\xe8\xf2" // "Сидит" #define sO_IsLaughing "\xd1\xec\xe5\xe5\xf2\xf1\xff" // "Смеется" #define sO_WithAll "\xd1\xee \xe2\xf1\xe5\xec\xe8" // "Со всеми" -#define sO_WithMop "\xd1\xee \xf8\xe2\xe0\xe1\xf0\xee\xe9" // "Со шваброй" +#define sO_WithSwab "\xd1\xee \xf8\xe2\xe0\xe1\xf0\xee\xe9" // "Со шваброй" #define sO_WithHose "\xd1\xee \xf8\xeb\xe0\xed\xe3\xee\xec" // "Со шлангом" -#define sO_WithBrush "\xd1\xee \xf9\xe5\xf2\xea\xee\xe9" // "Со щеткой" +#define sO_WithBroom "\xd1\xee \xf9\xe5\xf2\xea\xee\xe9" // "Со щеткой" #define sO_IsSleeping "\xd1\xef\xe8\xf2" // "Спит" #define sO_OnRight "\xd1\xef\xf0\xe0\xe2\xe0" // "Справа" #define sO_IsStandingInBoots "\xd1\xf2\xee\xe8\xf2 \xe2 \xe1\xee\xf2\xe8\xed\xea\xe0\xf5" // "Стоит в ботинках" @@ -229,7 +229,7 @@ namespace Fullpipe { #define sO_NearPipeWithStool "\xd3 \xf2\xf0\xf3\xe1\xfb \xf1 \xf2\xe0\xe1\xf3\xf0\xe5\xf2\xea\xee\xe9" // "У трубы с табуреткой" #define sO_NearPipe "\xd3 \xf2\xf0\xf3\xe1\xfb" // "У трубы" #define sO_Janitors "\xd3\xe1\xee\xf0\xf9\xe8\xea\xe8" // "Уборщики" -#define sO_Janitress "\xd3\xe1\xee\xf0\xf9\xe8\xf6\xe0" // "Уборщица" +#define sO_Maid "\xd3\xe1\xee\xf0\xf9\xe8\xf6\xe0" // "Уборщица" #define sO_IsGone "\xd3\xe5\xf5\xe0\xeb\xe0" // "Уехала" #define sO_FallenTwice "\xd3\xef\xe0\xeb \xe4\xe2\xe0" // "Упал два" #define sO_FallenOnce "\xd3\xef\xe0\xeb \xf0\xe0\xe7" // "Упал раз" diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp new file mode 100644 index 0000000000..9dd8d2a0af --- /dev/null +++ b/engines/fullpipe/scenes/scene27.cpp @@ -0,0 +1,125 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "fullpipe/fullpipe.h" + +#include "fullpipe/objectnames.h" +#include "fullpipe/constants.h" + +#include "fullpipe/gameloader.h" +#include "fullpipe/motion.h" +#include "fullpipe/scenes.h" +#include "fullpipe/statics.h" + +#include "fullpipe/interaction.h" +#include "fullpipe/behavior.h" + + +namespace Fullpipe { + +void scene27_initScene(Scene *sc) { + g_vars->scene27_var01 = 200; + g_vars->scene27_var02 = 200; + g_vars->scene27_var03 = 300; + g_vars->scene27_var04 = 300; + g_vars->scene27_hitZone = sc->getPictureObjectById(PIC_SC27_HITZONE2, 0); + g_vars->scene27_driver = sc->getStaticANIObject1ById(ANI_VODILLA, -1); + g_vars->scene27_maid = sc->getStaticANIObject1ById(ANI_MAID, -1); + g_vars->scene27_batHandler = sc->getStaticANIObject1ById(ANI_BITAHANDLER, -1); + + g_vars->scene27_balls.numBalls = 0; + g_vars->scene27_balls.pPrev = 0; + g_vars->scene27_balls.pNext = 0; + g_vars->scene27_balls.ball = 0; + CPlex::FreeDataChain(g_vars->scene27_balls.cPlex); + g_vars->scene27_balls.cPlex = 0; + scene27_bats.clear(); + scene27_var07.clear(); + + g_vars->scene27_var15 = 1; + g_vars->scene27_bat = sc->getStaticANIObject1ById(ANI_BITA, -1); + + for (int i = 0; i < 4; i++) { + StaticANIObject *newbat = new StaticANIObject(g_vars->scene27_bat); + + v5 = g_vars->scene27_balls.pPrev; + v6 = g_vars->scene27_balls.pNext; + + if (!g_vars->scene27_balls.pPrev) { + v7 = CPlex::Create(&g_vars->scene27_balls.cPlex, g_vars->scene27_balls.cPlexLen, 12) + 4 + 12 * g_vars->scene27_balls.cPlexLen - 12; + if (g_vars->scene27_balls.cPlexLen - 1 < 0) { + v5 = g_vars->scene27_balls.pPrev; + } else { + v8 = g_vars->scene27_balls.cPlexLen; + v5 = g_vars->scene27_balls.pPrev; + do { + *(_DWORD *)v7 = v5; + v5 = (Ball *)v7; + v7 -= 12; + --v8; + } while (v8); + + g_vars->scene27_balls.pPrev = v5; + } + } + + g_vars->scene27_balls.pPrev = v5->pNext; + v5->pPrev = v6; + v5->pNext = 0; + ++g_vars->scene27_balls.numBalls; + v5->ani = 0; + v5->ani = newbat; + + if (g_vars->scene27_balls.pNext) + g_vars->scene27_balls.pNext->pNext = v5; + else + g_vars->scene27_balls.ball = v5; + g_vars->scene27_balls.pNext = v5; + + sc->addStaticANIObject(newbat, 1); + } + + g_vars->scene27_var08 = 0; + g_vars->scene27_var09 = 0; + g_vars->scene27_var10 = 0; + g_vars->scene27_var11 = 0; + g_vars->scene27_var12 = 0; + g_vars->scene27_var13 = 0; + g_vars->scene27_launchPhase = 0; + + oldsc = g_fp->_currentScene; + g_fp->_currentScene = sc; + + if (g_fp->getObjectState(sO_Maid) == g_fp->getObjectEnumState(sO_Maid, sO_WithSwab)) { + StaticANIObject_changeStatics2(g_vars->scene27_maid, ST_MID_SWAB2); + } else if (g_fp->getObjectState(sO_Maid) == g_fp->getObjectEnumState(sO_Maid, sO_WithBroom)) { + StaticANIObject_changeStatics2(g_vars->scene27_maid, ST_MID_BROOM); + } else if (g_fp->getObjectState(sO_Maid) == g_fp->getObjectEnumState(sO_Maid, sO_WithSpade)) { + StaticANIObject_changeStatics2(g_vars->scene27_maid, ST_MID_SPADE); + } + + g_fp->_currentScene = oldsc; + + g_fp->setArcadeOverlay(PIC_CSR_ARCADE7); +} + +} // End of namespace Fullpipe |