[Scummvm-cvs-logs] scummvm master -> 41382ad1b393d8b6144dd6477f06b8a6e038c757
sev-
sev at scummvm.org
Wed Jan 1 01:46:37 CET 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1e3509e653 FULLPIPE: Rename remaining vars in scene14. This completes the scene
41382ad1b3 FULLPIPE: Started implementation of scene16
Commit: 1e3509e6538bf3a44abb2d1f9a37dd6945707fa0
https://github.com/scummvm/scummvm/commit/1e3509e6538bf3a44abb2d1f9a37dd6945707fa0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T16:10:12-08:00
Commit Message:
FULLPIPE: Rename remaining vars in scene14. This completes the scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index f722507..0df58db 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -216,11 +216,11 @@ Vars::Vars() {
scene14_grandmaX = 0;
scene14_grandmaY = 0;
scene14_dude2X = 0;
- scene14_var20 = 0;
- scene14_var21 = 0;
- scene14_var22 = 0;
- scene14_var23 = 0;
- scene14_var24 = 0;
+ scene14_ballDeltaX = 0;
+ scene14_ballDeltaY = 0;
+ scene14_ballX = 0;
+ scene14_ballY = 0;
+ scene14_hitsLeft = 0;
scene15_chantingCountdown = 0;
scene15_plusminus = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 16bdfbd..664eb74 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -292,11 +292,11 @@ public:
int scene14_grandmaX;
int scene14_grandmaY;
int scene14_dude2X;
- int scene14_var20;
- int scene14_var21;
- int scene14_var22;
- int scene14_var23;
- int scene14_var24;
+ int scene14_ballDeltaX;
+ int scene14_ballDeltaY;
+ int scene14_ballX;
+ int scene14_ballY;
+ int scene14_hitsLeft;
Common::Point scene14_mouseCursorPos;
int scene15_chantingCountdown;
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 72bb41e..b31dc89 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -210,14 +210,14 @@ void sceneHandler14_manKickBall() {
int val = (g_vars->scene14_grandmaX + 65 - (g_vars->scene14_dudeX - 85)) / -32;
int den = val;
- g_vars->scene14_var22 = g_vars->scene14_dudeX - 85;
- g_vars->scene14_var23 = g_vars->scene14_dudeY - 76;
- g_vars->scene14_var20 = -32;
+ g_vars->scene14_ballX = g_vars->scene14_dudeX - 85;
+ g_vars->scene14_ballY = g_vars->scene14_dudeY - 76;
+ g_vars->scene14_ballDeltaX = -32;
if (!val)
den = 1;
- g_vars->scene14_var21 = (g_vars->scene14_grandmaY - 102 - val * val / 2 - (g_vars->scene14_dudeY - 76)) / den;
+ g_vars->scene14_ballDeltaY = (g_vars->scene14_grandmaY - 102 - val * val / 2 - (g_vars->scene14_dudeY - 76)) / den;
g_vars->scene14_flyingBall->show1(g_vars->scene14_dudeX - 85, g_vars->scene14_dudeY - 76, -1, 0);
g_vars->scene14_flyingBall->startAnim(MV_BAL14_SPIN, 0, -1);
@@ -236,7 +236,7 @@ void sceneHandler14_showBallFly() {
if (g_vars->scene14_grandma->_movement) {
x = g_vars->scene14_grandma->_movement->_ox;
- g_vars->scene14_var22 = x;
+ g_vars->scene14_ballX = x;
y = g_vars->scene14_grandma->_movement->_oy;
} else {
x = g_vars->scene14_grandmaX;
@@ -246,7 +246,7 @@ void sceneHandler14_showBallFly() {
x = x + 38;
y = y - 77;
- g_vars->scene14_var20 = 32;
+ g_vars->scene14_ballDeltaX = 32;
int dist = (g_vars->scene14_dudeX - 16 - x) / 32;
int den = dist;
@@ -254,11 +254,11 @@ void sceneHandler14_showBallFly() {
if (!dist)
den = 1;
- g_vars->scene14_var22 = x + 32;
- g_vars->scene14_var21 = (g_vars->scene14_dudeY - 40 - dist * dist / 2 - y) / den;
- g_vars->scene14_var23 = g_vars->scene14_var21 + y;
+ g_vars->scene14_ballX = x + 32;
+ g_vars->scene14_ballDeltaY = (g_vars->scene14_dudeY - 40 - dist * dist / 2 - y) / den;
+ g_vars->scene14_ballY = g_vars->scene14_ballDeltaY + y;
- g_vars->scene14_flyingBall->show1(x + 32, g_vars->scene14_var21 + y, MV_BAL14_SPIN, 0);
+ g_vars->scene14_flyingBall->show1(x + 32, g_vars->scene14_ballDeltaY + y, MV_BAL14_SPIN, 0);
g_vars->scene14_flyingBall->_priority = 5;
g_vars->scene14_flyingBall->startAnim(MV_BAL14_SPIN, 0, -1);
@@ -371,7 +371,7 @@ void sceneHandler14_startArcade() {
g_fp->_aniMan2 = 0;
g_vars->scene14_sceneDeltaX = 50;
g_vars->scene14_sceneDiffX = 100;
- g_vars->scene14_var24 = 4;
+ g_vars->scene14_hitsLeft = 4;
g_vars->scene14_pink = 0;
chainQueue(QU_SC14_STARTARCADE, 0);
@@ -554,7 +554,7 @@ void sceneHandler14_dudeFall() {
sceneHandler14_grandmaJumpThrow();
}
- ++g_vars->scene14_var24;
+ ++g_vars->scene14_hitsLeft;
}
void sceneHandler14_grandmaStepForward() {
@@ -574,7 +574,7 @@ void sceneHandler14_arcadeLogic() {
if (g_vars->scene14_dudeIsKicking)
sceneHandler14_clearCallback();
- if (g_vars->scene14_var24 <= 1) {
+ if (g_vars->scene14_hitsLeft <= 1) {
setInputDisabled(1);
sceneHandler14_clearCallback();
@@ -584,13 +584,13 @@ void sceneHandler14_arcadeLogic() {
chainQueue(QU_SC14_WINARCADE, 1);
- --g_vars->scene14_var24;
+ --g_vars->scene14_hitsLeft;
} else {
ExCommand *ex;
g_vars->scene14_grandma->changeStatics2(ST_GMA_SIT);
- if (g_vars->scene14_var24 != 3 || g_vars->scene14_pink) {
+ if (g_vars->scene14_hitsLeft != 3 || g_vars->scene14_pink) {
MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
ex = new ExCommand(ANI_GRANDMA, 1, MV_GMA_BACKOFF, 0, 0, 0, 1, 0, 0, 0);
@@ -617,22 +617,22 @@ void sceneHandler14_arcadeLogic() {
}
sceneHandler14_grandmaStepForward();
- --g_vars->scene14_var24;
+ --g_vars->scene14_hitsLeft;
}
}
void sceneHandler14_animateBall() {
- int x = g_vars->scene14_var20 + g_vars->scene14_var22;
- int y = g_vars->scene14_var21 + g_vars->scene14_var23;
+ int x = g_vars->scene14_ballDeltaX + g_vars->scene14_ballX;
+ int y = g_vars->scene14_ballDeltaY + g_vars->scene14_ballY;
- g_vars->scene14_var22 += g_vars->scene14_var20;
- g_vars->scene14_var23 += g_vars->scene14_var21;
+ g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
+ g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
- g_vars->scene14_var21++;
+ g_vars->scene14_ballDeltaY++;
- if (g_vars->scene14_var21 - 1 + g_vars->scene14_var23 > 517) {
+ if (g_vars->scene14_ballDeltaY - 1 + g_vars->scene14_ballY > 517) {
if (x <= g_vars->scene14_dudeX - 16 ) {
- if ( g_vars->scene14_var20 >= 0 || x >= g_vars->scene14_grandmaX + 65 || x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102 ) {
+ if ( g_vars->scene14_ballDeltaX >= 0 || x >= g_vars->scene14_grandmaX + 65 || x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102 ) {
if (g_vars->scene14_flyingBall->_movement)
g_vars->scene14_flyingBall->_movement->setOXY(x, y);
else
Commit: 41382ad1b393d8b6144dd6477f06b8a6e038c757
https://github.com/scummvm/scummvm/commit/41382ad1b393d8b6144dd6477f06b8a6e038c757
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T16:45:34-08:00
Commit Message:
FULLPIPE: Started implementation of scene16
Changed paths:
A engines/fullpipe/scenes/scene16.cpp
engines/fullpipe/objectnames.h
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 023e070..219f1b9 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -52,6 +52,7 @@ namespace Fullpipe {
#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_16 "\xc2_16" // "В_16"
#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"
@@ -202,7 +203,7 @@ namespace Fullpipe {
#define sO_Convoluted "\xd1\xe2\xe5\xf0\xed\xf3\xf2" // "Свернут"
#define sO_IsFree "\xd1\xe2\xee\xe1\xee\xe4\xed\xe0" // "Свободна"
#define sO_IsSitting "\xd1\xe8\xe4\xe8\xf2" // "Сидит"
-#define sO_Laughing "\xd1\xec\xe5\xe5\xf2\xf1\xff" // "Смеется"
+#define sO_IsLaughing "\xd1\xec\xe5\xe5\xf2\xf1\xff" // "Смеется"
#define sO_WithEveryone "\xd1\xee \xe2\xf1\xe5\xec\xe8" // "Со всеми"
#define sO_WithMop "\xd1\xee \xf8\xe2\xe0\xe1\xf0\xee\xe9" // "Со шваброй"
#define sO_WithHose "\xd1\xee \xf8\xeb\xe0\xed\xe3\xee\xec" // "Со шлангом"
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
new file mode 100644
index 0000000..cafe4d3
--- /dev/null
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -0,0 +1,112 @@
+/* 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 scene16_initScene(Scene *sc) {
+ g_vars->scene16_var01 = 200;
+ g_vars->scene16_var02 = 200;
+ g_vars->scene16_var03 = 300;
+ g_vars->scene16_var04 = 300;
+ g_vars->scene16_var05.clear();
+ g_vars->scene16_var06 = 0;
+ g_vars->scene16_var07 = 0;
+ g_vars->scene16_var08 = 200;
+ g_vars->scene16_wire = sc->getStaticANIObject1ById(ANI_WIRE16, -1);
+ g_vars->scene16_mug = sc->getStaticANIObject1ById(ANI_MUG, -1);
+ g_vars->scene16_jettie = sc->getStaticANIObject1ById(ANI_JETTIE, -1);
+ g_vars->scene16_boot = sc->getStaticANIObject1ById(ANI_BOOT_16, -1);
+ g_vars->scene16_var09 = 0;
+ g_vars->scene16_sound = SND_16_034;
+
+ if (g_fp->getObjectState(sO_Bridge) == g_fp->getObjectEnumState(sO_Bridge, sO_Convoluted)) {
+ g_vars->scene16_var10 = 1;
+
+ StaticANIObject *boy = sc->getStaticANIObject1ById(ANI_BOY, -1);
+ boy->loadMovementsPixelData();
+
+ StaticANIObject *newboy = new StaticANIObject(boy);
+ sc->addStaticANIObject(boy, 1);
+
+ int phase = 0;
+
+ for (int i = 0; i < 3; i++) {
+ g_vars->scene16_var05.push_back(*(&boy + phase));
+
+ phase++;
+
+ if (phase >= 2)
+ phase = 0;
+ }
+
+ g_vars->scene16_var05.push_back(sc->getStaticANIObject1ById(ANI_GIRL, -1));
+
+ for (int i = 0; i < 4; i++) {
+ g_vars->scene16_var05.push_back(*(&boy + phase));
+
+ phase++;
+
+ if (phase >= 2)
+ phase = 0;
+ }
+ } else {
+ g_fp->setObjectState(sO_Girl, g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging));
+
+ g_vars->scene16_var10 = 0;
+
+ StaticANIObject *ani = new StaticANIObject(accessScene(SC_COMMON)->getStaticANIObject1ById(ANI_BEARDED_CMN, -1));
+ ani->_movement = 0;
+ ani->_statics = ani->_staticsList[0];
+ sc->addStaticANIObject(ani, 1);
+ }
+
+ if (g_fp->getObjectState(sO_Girl) == g_fp->getObjectEnumState(sO_Girl, sO_IsLaughing)) {
+ StaticANIObject *girl = sc->getStaticANIObject1ById(ANI_GIRL, -1);
+
+ girl->show1(554, 432, MV_GRL_LAUGH_POPA, 0);
+ girl->_priority = 20;
+ }
+
+ if (g_fp->getObjectState(sO_Cup) == g_fp->getObjectEnumState(sO_Cup, sO_In_16)) {
+ g_vars->scene16_mug->_statics = g_vars->scene16_mug->getStaticsById(ST_MUG_EMPTY);
+ g_vars->scene16_mug->_movement = 0;
+ g_vars->scene16_mug->setOXY(409, 459);
+ g_vars->scene16_mug->_priority = 5;
+ g_vars->scene16_mug->_flags |= 4;
+ }
+}
+
+} // End of namespace Fullpipe
More information about the Scummvm-git-logs
mailing list