[Scummvm-cvs-logs] scummvm master -> 49473972ce8b6b3ca9ba786911d7456fc596bcdb
sev-
sev at scummvm.org
Tue Dec 24 22:01:08 CET 2013
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f58cdb98b3 FULLPIPE: Implement scene15_init()
575f93156c FULLPIPE: Implement scene15_updateCursor()
bfb5f3521a FULLPIPE: Implement sceneHandler15()
af5b8cccf6 FULLPIPE: Plug scene15 in
49473972ce FULLPIPE: Renames in scene15. This completes scene
Commit: f58cdb98b33e9c4464ff5bf5b30b51e4c4716c5b
https://github.com/scummvm/scummvm/commit/f58cdb98b33e9c4464ff5bf5b30b51e4c4716c5b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T12:12:05-08:00
Commit Message:
FULLPIPE: Implement scene15_init()
Changed paths:
A engines/fullpipe/scenes/scene15.cpp
engines/fullpipe/constants.h
engines/fullpipe/module.mk
engines/fullpipe/objectnames.h
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 63ab988..aa1eb58 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -500,6 +500,15 @@ namespace Fullpipe {
#define ST_SWR_SITBALD 1153
#define ST_SWR_STAND3 3014
+// Scene 15
+#define ANI_BOOT_15 4779
+#define ANI_GRANDMA_ASS 1265
+#define PIC_SC15_LADDER 3253
+#define QU_SC15_ENTERLIFT 2811
+#define QU_SC15_EXITLIFT 2812
+#define ST_GMS_BOOT 1270
+#define ST_GMS_BOOTLESS2 3316
+
} // End of namespace Fullpipe
#endif /* FULLPIPE_CONSTANTS_H */
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 230cfe6..15bf9c9 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -34,6 +34,7 @@ MODULE_OBJS = \
scenes/scene08.o \
scenes/scene10.o \
scenes/scene11.o \
+ scenes/scene15.o \
scenes/sceneDbg.o \
scenes/sceneIntro.o
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 07526d0..87442d9 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -48,6 +48,10 @@ namespace Fullpipe {
#define sO_InSock "\xc2 \xed\xee\xf1\xea\xe5" // "В носке"
#define sO_InGlasses "\xc2 \xee\xf7\xea\xe0\xf5" // "В очках"
#define sO_In_14 "\xc2_14" // "В_14"
+#define sO_In_15 "\xc2_15" // "В_15"
+#define sO_In_15_1 "\xc2_15_1" // "В_15_1"
+#define sO_In_15_2 "\xc2_15_2" // "В_15_2"
+#define sO_In_15_3 "\xc2_15_3" // "В_15_3"
#define sO_In_32_Lies "\xc2_32 \xeb\xe5\xe6\xe8\xf2" // "В_32 лежит"
#define sO_In_32_Stands "\xc2_32 \xf2\xee\xf0\xf7\xe8\xf2" // "В_32 торчит"
#define sO_In_33 "\xc2_33" // "В_33"
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 921cdfd..4a37810 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -186,6 +186,15 @@ Vars::Vars() {
scene11_var19 = 0;
scene11_var20 = 0;
+ scene15_var01 = 0;
+ scene15_var02 = 0;
+ scene15_var03 = 0;
+ scene15_var04 = 0;
+ scene15_var05 = 0;
+ scene15_plusminus = 0;
+ scene15_ladder = 0;
+ scene15_boot = 0;
+
selector = 0;
}
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index d492a6a..4031b47 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -238,6 +238,15 @@ public:
int scene11_var19;
int scene11_var20;
+ int scene15_var01;
+ int scene15_var02;
+ int scene15_var03;
+ int scene15_var04;
+ int scene15_var05;
+ StaticANIObject *scene15_plusminus;
+ PictureObject *scene15_ladder;
+ StaticANIObject *scene15_boot;
+
PictureObject *selector;
};
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp
new file mode 100644
index 0000000..f580831
--- /dev/null
+++ b/engines/fullpipe/scenes/scene15.cpp
@@ -0,0 +1,98 @@
+/* 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 scene15_initScene(Scene *sc) {
+ g_vars->scene15_var01 = 200;
+ g_vars->scene15_var02 = 200;
+ g_vars->scene15_var03 = 300;
+ g_vars->scene15_var04 = 300;
+ g_vars->scene15_var05 = 0;
+
+ StaticANIObject *grandma = sc->getStaticANIObject1ById(ANI_GRANDMA_ASS, -1);
+
+ Scene *oldsc = g_fp->_currentScene;
+ g_fp->_currentScene = sc;
+
+ int grandmaState = g_fp->getObjectState(sO_Grandma);
+
+ if (grandmaState == g_fp->getObjectEnumState(sO_Grandma, sO_In_15)) {
+ grandma->changeStatics2(ST_GMS_BOOT);
+ grandma->setOXY(97, 399);
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsClosed));
+ } else if (grandmaState == g_fp->getObjectEnumState(sO_Grandma, sO_In_15_1)) {
+ grandma->changeStatics2(ST_GMS_BOOT);
+ grandma->setOXY(86, 399);
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsClosed));
+ } else if (grandmaState == g_fp->getObjectEnumState(sO_Grandma, sO_In_15_2)) {
+ grandma->changeStatics2(ST_GMS_BOOT);
+ grandma->setOXY(71, 399);
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsClosed));
+ } else if (grandmaState == g_fp->getObjectEnumState(sO_Grandma, sO_In_15_3)) {
+ grandma->changeStatics2(ST_GMS_BOOT);
+ grandma->setOXY(49, 399);
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsClosed));
+ } else if (grandmaState == g_fp->getObjectEnumState(sO_Grandma, sO_WithoutBoot)) {
+ grandma->changeStatics2(ST_GMS_BOOT);
+ grandma->setOXY(97, 399);
+ grandma->changeStatics2(ST_GMS_BOOTLESS2);
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsClosed));
+ } else {
+ grandma->hide();
+ g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsOpened));
+ }
+
+ g_vars->scene15_plusminus = sc->getStaticANIObject1ById(ANI_PLUSMINUS, -1);
+
+ if (g_fp->getObjectState(sO_Gurad_2) == g_fp->getObjectEnumState(sO_Gurad_2, sO_Off))
+ g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_MINUS);
+ else
+ g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_PLUS);
+
+ g_vars->scene15_ladder = sc->getPictureObjectById(PIC_SC15_LADDER, 0);
+ g_vars->scene15_boot = sc->getStaticANIObject1ById(ANI_BOOT_15, -1);
+
+ if (g_fp->getObjectState(sO_Boot_15) != g_fp->getObjectEnumState(sO_Boot_15, sO_Available))
+ g_vars->scene15_boot->_flags &= 0xFFFB;
+
+ g_fp->_currentScene = oldsc;
+
+ g_fp->lift_setButton(sO_Level5, ST_LBN_5N);
+ g_fp->lift_sub5(sc, QU_SC15_ENTERLIFT, QU_SC15_EXITLIFT);
+}
+
+} // End of namespace Fullpipe
Commit: 575f93156cb5c70fc4d95942b40e179f294eb094
https://github.com/scummvm/scummvm/commit/575f93156cb5c70fc4d95942b40e179f294eb094
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T12:14:26-08:00
Commit Message:
FULLPIPE: Implement scene15_updateCursor()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene15.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index aa1eb58..b7edab6 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -504,6 +504,7 @@ namespace Fullpipe {
#define ANI_BOOT_15 4779
#define ANI_GRANDMA_ASS 1265
#define PIC_SC15_LADDER 3253
+#define PIC_SC15_LTRUBA 1261
#define QU_SC15_ENTERLIFT 2811
#define QU_SC15_EXITLIFT 2812
#define ST_GMS_BOOT 1270
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp
index f580831..56a496e 100644
--- a/engines/fullpipe/scenes/scene15.cpp
+++ b/engines/fullpipe/scenes/scene15.cpp
@@ -95,4 +95,13 @@ void scene15_initScene(Scene *sc) {
g_fp->lift_sub5(sc, QU_SC15_ENTERLIFT, QU_SC15_EXITLIFT);
}
+int scene15_updateCursor() {
+ g_fp->updateCursorCommon();
+
+ if (g_fp->_cursorId == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC15_LTRUBA)
+ g_fp->_cursorId = PIC_CSR_GOL;
+
+ return g_fp->_cursorId;
+}
+
} // End of namespace Fullpipe
Commit: bfb5f3521aa80a9e4a6a088160a51cc0c2e4ea16
https://github.com/scummvm/scummvm/commit/bfb5f3521aa80a9e4a6a088160a51cc0c2e4ea16
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T12:47:53-08:00
Commit Message:
FULLPIPE: Implement sceneHandler15()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene15.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index b7edab6..e2dff76 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -503,10 +503,18 @@ namespace Fullpipe {
// Scene 15
#define ANI_BOOT_15 4779
#define ANI_GRANDMA_ASS 1265
+#define MSG_SC15_ASSDRYG 4755
+#define MSG_SC15_LADDERTOBACK 3259
+#define MSG_SC15_PULL 2940
+#define MSG_SC15_STOPCHANTING 4753
+#define PIC_SC15_DTRUBA 1263
#define PIC_SC15_LADDER 3253
#define PIC_SC15_LTRUBA 1261
#define QU_SC15_ENTERLIFT 2811
#define QU_SC15_EXITLIFT 2812
+#define SND_15_001 3798
+#define SND_15_006 3808
+#define SND_15_011 4754
#define ST_GMS_BOOT 1270
#define ST_GMS_BOOTLESS2 3316
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 4a37810..63d6d0a 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -191,6 +191,8 @@ Vars::Vars() {
scene15_var03 = 0;
scene15_var04 = 0;
scene15_var05 = 0;
+ scene15_var06 = 0;
+ scene15_var07 = 0;
scene15_plusminus = 0;
scene15_ladder = 0;
scene15_boot = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 4031b47..e9c9ada 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -243,6 +243,8 @@ public:
int scene15_var03;
int scene15_var04;
int scene15_var05;
+ int scene15_var06;
+ int scene15_var07;
StaticANIObject *scene15_plusminus;
PictureObject *scene15_ladder;
StaticANIObject *scene15_boot;
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp
index 56a496e..04c3466 100644
--- a/engines/fullpipe/scenes/scene15.cpp
+++ b/engines/fullpipe/scenes/scene15.cpp
@@ -104,4 +104,113 @@ int scene15_updateCursor() {
return g_fp->_cursorId;
}
+int sceneHandler15(ExCommand *cmd) {
+ if (cmd->_messageKind != 17)
+ return 0;
+
+ switch(cmd->_messageNum) {
+ case MSG_LIFT_CLOSEDOOR:
+ g_fp->lift_closedoorSeq();
+ break;
+
+ case MSG_LIFT_EXITLIFT:
+ g_fp->lift_exitSeq(cmd);
+ break;
+
+ case MSG_LIFT_STARTEXITQUEUE:
+ g_fp->lift_startExitQueue();
+ break;
+
+ case MSG_SC4_HIDEBOOT:
+ g_vars->scene15_boot->_flags &= 0xFFFB;
+ break;
+
+ case MSG_SC15_STOPCHANTING:
+ g_fp->stopAllSoundInstances(SND_15_001);
+
+ g_vars->scene15_var05 = 120;
+ break;
+
+ case MSG_SC15_ASSDRYG:
+ if (g_fp->_rnd->getRandomNumber(1))
+ g_fp->playSound(SND_15_011, 0);
+ else
+ g_fp->playSound(SND_15_006, 0);
+
+ break;
+
+ case MSG_SC15_LADDERTOBACK:
+ g_vars->scene15_ladder->_priority = 60;
+ break;
+
+ case MSG_LIFT_GO:
+ g_fp->lift_goAnimation();
+ break;
+
+ case MSG_LIFT_CLICKBUTTON:
+ g_fp->lift_animation3();
+ break;
+
+ case MSG_SC15_PULL:
+ if (g_vars->scene15_plusminus->_statics->_staticsId == ST_PMS_MINUS)
+ g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_PLUS);
+ else
+ g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_MINUS);
+
+ break;
+
+ case 64:
+ g_fp->lift_sub05(cmd);
+ break;
+
+ case 29:
+ {
+ if (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC15_LADDER) {
+ handleObjectInteraction(g_fp->_aniMan, g_fp->_currentScene->getPictureObjectById(PIC_SC15_DTRUBA, 0), cmd->_keyCode);
+ cmd->_messageKind = 0;
+
+ return 0;
+ }
+
+ StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY);
+
+ if (ani && ani->_id == ANI_LIFTBUTTON) {
+ g_fp->lift_sub1(ani);
+
+ cmd->_messageKind = 0;
+ }
+ break;
+ }
+
+ case 30:
+ // nop
+ break;
+
+ case 33:
+ if (g_fp->_aniMan2) {
+ int x = g_fp->_aniMan2->_ox;
+
+ g_vars->scene15_var06 = x;
+ g_vars->scene15_var07 = g_fp->_aniMan2->_oy;
+
+ if (x < g_fp->_sceneRect.left + g_vars->scene15_var01)
+ g_fp->_currentScene->_x = x - g_vars->scene15_var03 - g_fp->_sceneRect.left;
+
+ if (x > g_fp->_sceneRect.right - g_vars->scene15_var01)
+ g_fp->_currentScene->_x = x + g_vars->scene15_var03 - g_fp->_sceneRect.right;
+ }
+
+ if (g_vars->scene15_var05 > 0) {
+ g_vars->scene15_var05--;
+
+ if (!g_vars->scene15_var05)
+ g_fp->playSound(SND_15_001, 1);
+ }
+
+ g_fp->_behaviorManager->updateBehaviors();
+ }
+
+ return 0;
+}
+
} // End of namespace Fullpipe
Commit: af5b8cccf61527735fcb67bf8434a0ac75132b3e
https://github.com/scummvm/scummvm/commit/af5b8cccf61527735fcb67bf8434a0ac75132b3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T12:49:09-08:00
Commit Message:
FULLPIPE: Plug scene15 in
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 63d6d0a..d61d48b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -475,6 +475,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene14_sub_41D2B0();
_updateCursorCallback = scene14_updateCursor;
break;
+#endif
case SC_15:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_15");
@@ -487,6 +488,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
_updateCursorCallback = scene15_updateCursor;
break;
+#if 0
case SC_16:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_16");
scene->preloadMovements(sceneVar);
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index e9c9ada..941cbc9 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -72,6 +72,10 @@ void scene10_initScene(Scene *sc);
int sceneHandler10(ExCommand *cmd);
int scene10_updateCursor();
+int scene15_updateCursor();
+void scene15_initScene(Scene *sc);
+int sceneHandler15(ExCommand *cmd);
+
void sceneDbgMenu_initScene(Scene *sc);
int sceneHandlerDbgMenu(ExCommand *cmd);
Commit: 49473972ce8b6b3ca9ba786911d7456fc596bcdb
https://github.com/scummvm/scummvm/commit/49473972ce8b6b3ca9ba786911d7456fc596bcdb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T13:00:05-08:00
Commit Message:
FULLPIPE: Renames in scene15. This completes scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene15.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index d61d48b..fdfee97 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -186,13 +186,7 @@ Vars::Vars() {
scene11_var19 = 0;
scene11_var20 = 0;
- scene15_var01 = 0;
- scene15_var02 = 0;
- scene15_var03 = 0;
- scene15_var04 = 0;
- scene15_var05 = 0;
- scene15_var06 = 0;
- scene15_var07 = 0;
+ scene15_chantingCountdown = 0;
scene15_plusminus = 0;
scene15_ladder = 0;
scene15_boot = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 941cbc9..8c4257f 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -242,13 +242,7 @@ public:
int scene11_var19;
int scene11_var20;
- int scene15_var01;
- int scene15_var02;
- int scene15_var03;
- int scene15_var04;
- int scene15_var05;
- int scene15_var06;
- int scene15_var07;
+ int scene15_chantingCountdown;
StaticANIObject *scene15_plusminus;
PictureObject *scene15_ladder;
StaticANIObject *scene15_boot;
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp
index 04c3466..8310fc8 100644
--- a/engines/fullpipe/scenes/scene15.cpp
+++ b/engines/fullpipe/scenes/scene15.cpp
@@ -37,11 +37,7 @@
namespace Fullpipe {
void scene15_initScene(Scene *sc) {
- g_vars->scene15_var01 = 200;
- g_vars->scene15_var02 = 200;
- g_vars->scene15_var03 = 300;
- g_vars->scene15_var04 = 300;
- g_vars->scene15_var05 = 0;
+ g_vars->scene15_chantingCountdown = 0;
StaticANIObject *grandma = sc->getStaticANIObject1ById(ANI_GRANDMA_ASS, -1);
@@ -128,7 +124,7 @@ int sceneHandler15(ExCommand *cmd) {
case MSG_SC15_STOPCHANTING:
g_fp->stopAllSoundInstances(SND_15_001);
- g_vars->scene15_var05 = 120;
+ g_vars->scene15_chantingCountdown = 120;
break;
case MSG_SC15_ASSDRYG:
@@ -190,20 +186,17 @@ int sceneHandler15(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- g_vars->scene15_var06 = x;
- g_vars->scene15_var07 = g_fp->_aniMan2->_oy;
+ if (x < g_fp->_sceneRect.left + 200)
+ g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
- if (x < g_fp->_sceneRect.left + g_vars->scene15_var01)
- g_fp->_currentScene->_x = x - g_vars->scene15_var03 - g_fp->_sceneRect.left;
-
- if (x > g_fp->_sceneRect.right - g_vars->scene15_var01)
- g_fp->_currentScene->_x = x + g_vars->scene15_var03 - g_fp->_sceneRect.right;
+ if (x > g_fp->_sceneRect.right - 200)
+ g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
- if (g_vars->scene15_var05 > 0) {
- g_vars->scene15_var05--;
+ if (g_vars->scene15_chantingCountdown > 0) {
+ g_vars->scene15_chantingCountdown--;
- if (!g_vars->scene15_var05)
+ if (!g_vars->scene15_chantingCountdown)
g_fp->playSound(SND_15_001, 1);
}
More information about the Scummvm-git-logs
mailing list