[Scummvm-cvs-logs] scummvm master -> 9a5e5c25894fa65a6476a0bab795133735a44d8b
sev-
sev at scummvm.org
Sat Dec 28 13:18:22 CET 2013
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0238e20c36 FULLPIPE: Implement sceneHandler11_jumpFromSwing()
8b308be18a FULLPIPE: More code to scene11
08922cd3c4 FULLPIPE: Implement sceneHandler11_swingerJumpDown()
b42c8e157e FULLPIPE: Implement scene11_dudeSwingCallback()
89db57906b FULLPIPE: Give proper names to subs in scene11
2c35897260 FULLPIPE: Rename variables in scene11
9a5e5c2589 FULLPIPE: Renames in scene11. This completes the scene
Commit: 0238e20c3687f0d3c4d6833d26ee3e27d9580743
https://github.com/scummvm/scummvm/commit/0238e20c3687f0d3c4d6833d26ee3e27d9580743
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:49-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_jumpFromSwing()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 2a6f03b..06b5f35 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -504,6 +504,7 @@ namespace Fullpipe {
#define MV_KCH_MOVE2 1099
#define MV_KCH_START 1121
#define MV_MAN11_JUMPHIT 1129
+#define MV_MAN11_JUMPFROMSWING 5209
#define MV_MAN11_JUMPOVER 1131
#define MV_MAN11_SWING_0 1109
#define MV_MAN11_SWING_1 1111
@@ -522,6 +523,7 @@ namespace Fullpipe {
#define ST_KCH_STATIC 1122
#define ST_MAN_1PIX 518
#define ST_MAN11_EMPTY 1110
+#define ST_MAN11_SWING 1127
#define ST_SWR_SIT 1147
#define ST_SWR_SITBALD 1153
#define ST_SWR_STAND3 3014
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index bde67d7..864d0eb 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -248,8 +248,43 @@ void sceneHandler11_showSwing() {
g_vars->scene11_dudeOnSwing->_priority = 20;
}
-void sceneHandler11_sub12() {
- warning("STUB: sceneHandler11_sub12()");
+void sceneHandler11_jumpFromSwing() {
+ g_vars->scene11_var02 = 0;
+ g_vars->scene11_hint->_flags &= 0xFFFB;
+ g_vars->scene11_var03 = 0;
+
+ getCurrSceneSc2MotionController()->setEnabled();
+ getGameLoaderInteractionController()->enableFlag24();
+
+ g_vars->scene11_var09 = 1.0;
+ g_vars->scene11_var11 = 1.0;
+ g_vars->scene11_var10 = 1.0;
+ g_vars->scene11_var08 = 1.0;
+
+ g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN11, -1);
+ g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
+ g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_KACHELI, -1);
+ g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_STATIC);
+ g_vars->scene11_dudeOnSwing->setOXY(691, 371);
+ g_vars->scene11_dudeOnSwing->_priority = 20;
+ g_vars->scene11_dudeOnSwing->_flags |= 4;
+
+ MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
+ ExCommand *ex = new ExCommand(g_fp->_aniMan->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
+ ex->_field_14 = 256;
+ ex->_messageNum = 0;
+ ex->_excFlags |= 3;
+ mq->addExCommandToEnd(ex);
+ mq->setFlags(mq->getFlags() | 1);
+
+ g_fp->_globalMessageQueueList->addMessageQueue(mq);
+
+ g_fp->_aniMan->_flags |= 0x104;
+ g_fp->_aniMan->changeStatics2(ST_MAN11_SWING);
+ g_fp->_aniMan->setOXY(685, 373);
+ g_fp->_aniMan->startAnim(MV_MAN11_JUMPFROMSWING, mq->_id, -1);
+
+ g_fp->_aniMan2 = g_fp->_aniMan;
}
void sceneHandler11_swing0() {
@@ -440,7 +475,7 @@ void sceneHandler11_swingLogic() {
}
if (ph > 38 && ph < 53 && fabs(g_vars->scene11_var10) <= 5.0)
- sceneHandler11_sub12();
+ sceneHandler11_jumpFromSwing();
}
}
Commit: 8b308be18a699237b61760b61afa1dbc0cd5bc7a
https://github.com/scummvm/scummvm/commit/8b308be18a699237b61760b61afa1dbc0cd5bc7a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:49-08:00
Commit Message:
FULLPIPE: More code to scene11
Changed paths:
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 864d0eb..ead3777 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -480,11 +480,28 @@ void sceneHandler11_swingLogic() {
}
void sceneHandler11_sub05() {
- warning("STUB: sceneHandler11_sub05()");
+ if (g_vars->scene11_var17 == 2)
+ g_vars->scene11_var18 = 1;
+ else if (g_vars->scene11_var17 == 1)
+ g_vars->scene11_var18 = 2;
+ else
+ g_vars->scene11_var18 = (g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex <= 45) + 1;
}
void sceneHandler11_sub06() {
- warning("STUB: sceneHandler11_sub06()");
+ if (g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots)) {
+ g_vars->scene11_var19 = 0;
+ g_vars->scene11_var20 = 0;
+
+ g_vars->scene11_swingie->changeStatics2(ST_SWR_SIT);
+ g_vars->scene11_swingie->setOXY(144, 389);
+
+ g_fp->setObjectState(sO_Swingie, g_fp->getObjectEnumState(sO_Swingie, sO_IsSitting));
+
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing1, 0);
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing2, 0);
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing3, 1);
+ }
}
void sceneHandler11_sub07() {
Commit: 08922cd3c46ba6a083baef02e146f8bf52ee5e1d
https://github.com/scummvm/scummvm/commit/08922cd3c46ba6a083baef02e146f8bf52ee5e1d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:49-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_swingerJumpDown()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 06b5f35..f9c9661 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -514,6 +514,7 @@ namespace Fullpipe {
#define QU_SC11_PUTBOOT1 2709
#define QU_SC11_PUTBOOT2 2710
#define QU_SC11_RESTARTMAN 1134
+#define QU_SWR_JUMPDOWN 1123
#define SND_11_022 3706
#define SND_11_024 3708
#define ST_BTS11_2 2707
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index ead3777..804a66b 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -504,8 +504,23 @@ void sceneHandler11_sub06() {
}
}
-void sceneHandler11_sub07() {
- warning("STUB: sceneHandler11_sub07()");
+void sceneHandler11_swingerJumpDown() {
+ MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SWR_JUMPDOWN), 0, 0);
+
+ mq->setFlags(mq->getFlags() | 1);
+
+ if (!mq->chain(g_vars->scene11_swingie))
+ delete mq;
+
+ g_vars->scene11_var19 = 0;
+ g_vars->scene11_var20 = 1;
+ g_vars->scene11_var06 = g_fp->_sceneRect.left;
+
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing1, 0);
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing2, 1);
+ getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing3, 0);
+
+ getCurrSceneSc2MotionController()->replaceNodeX(905, 805);
}
void sceneHandler11_winArcade() {
@@ -629,7 +644,8 @@ int sceneHandler11(ExCommand *cmd) {
&& g_vars->scene11_var19)) {
if (!g_vars->scene11_swingie->_movement) {
if ((g_vars->scene11_boots->_flags & 4) && g_vars->scene11_boots->_statics->_staticsId == ST_BTS11_2) {
- sceneHandler11_sub07();
+ sceneHandler11_swingerJumpDown();
+
g_fp->_behaviorManager->updateBehaviors();
g_fp->startSceneTrack();
return res;
Commit: b42c8e157ec5da523fb0d813bf3e2a4d8573651d
https://github.com/scummvm/scummvm/commit/b42c8e157ec5da523fb0d813bf3e2a4d8573651d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:49-08:00
Commit Message:
FULLPIPE: Implement scene11_dudeSwingCallback()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index f9c9661..7fd97d2 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -515,8 +515,10 @@ namespace Fullpipe {
#define QU_SC11_PUTBOOT2 2710
#define QU_SC11_RESTARTMAN 1134
#define QU_SWR_JUMPDOWN 1123
+#define SND_11_020 3704
#define SND_11_022 3706
#define SND_11_024 3708
+#define SND_11_031 5171
#define ST_BTS11_2 2707
#define ST_BTS11_ONE 2706
#define ST_KCH_0 1096
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 804a66b..5972064 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -37,7 +37,55 @@
namespace Fullpipe {
void scene11_dudeSwingCallback(int *arg) {
- warning("STUB: scene11_dudeSwingCallback()");
+ int oldarg = *arg;
+
+ *arg = 45 - (int)(g_vars->scene11_var08 * -29.66666666666666);
+
+ if (*arg < 1)
+ *arg = 1;
+
+ if (*arg > 90)
+ *arg = 90;
+
+ g_vars->scene11_var11 = (g_vars->scene11_var08 - g_vars->scene11_var09) * -490.0000000000001;
+ g_vars->scene11_var10 = g_vars->scene11_var11 * 0.0042 + g_vars->scene11_var10 - g_vars->scene11_var12 * (g_vars->scene11_var11 * 0.0042 + g_vars->scene11_var10);
+ g_vars->scene11_var08 = g_vars->scene11_var10 * 0.0042 + g_vars->scene11_var08;
+
+ if (g_vars->scene11_var08 < -1.5) {
+ g_vars->scene11_var08 = 1.0004882812500000;
+ g_vars->scene11_var10 = 1.0;
+ g_vars->scene11_var11 = 1.0;
+ }
+
+ if (g_vars->scene11_var08 > 1.5) {
+ g_vars->scene11_var08 = 1.9990234375;
+ g_vars->scene11_var10 = 1.0;
+ g_vars->scene11_var11 = 1.0;
+ }
+
+ if (g_vars->scene11_var23 == *arg && 0.0 != g_vars->scene11_var10 && fabs(g_vars->scene11_var10) < 2.5) {
+ g_vars->scene11_var10 = 1.0;
+ g_vars->scene11_var11 = 1.0;
+ g_vars->scene11_var08 = g_vars->scene11_var09;
+ }
+
+ g_vars->scene11_var15++;
+
+ if (g_vars->scene11_var02) {
+ if (g_vars->scene11_var05 <= 720) {
+ g_vars->scene11_var05++;
+
+ if (g_vars->scene11_var05 == 720)
+ g_vars->scene11_hint->_flags |= 4;
+ }
+ }
+
+ if (oldarg - 45 >= 0 != *arg - 45 >= 0 && g_vars->scene11_var02) {
+ if (oldarg >= *arg)
+ g_fp->playSound(SND_11_031, 0);
+ else
+ g_fp->playSound(SND_11_020, 0);
+ }
}
void scene11_setupMusic() {
Commit: 89db57906b33215099581b39cf2c56f755e34656
https://github.com/scummvm/scummvm/commit/89db57906b33215099581b39cf2c56f755e34656
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:49-08:00
Commit Message:
FULLPIPE: Give proper names to subs in scene11
Changed paths:
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 5972064..3f4c8cd 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -371,7 +371,7 @@ void sceneHandler11_swing2() {
g_vars->scene11_var09 = fabs(g_vars->scene11_var08) * 0.075 + 0.12;
}
-void sceneHandler11_sub09() {
+void sceneHandler11_emptySwing() {
if (g_vars->scene11_var17)
sceneHandler11_swing0();
@@ -386,10 +386,10 @@ void sceneHandler11_sub09() {
g_vars->scene11_var12 = 1.9881250;
}
-void sceneHandler11_sub08() {
+void sceneHandler11_jumpHitAndWin() {
MGMInfo mgminfo;
- sceneHandler11_sub09();
+ sceneHandler11_emptySwing();
g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
MV_MAN11_JUMPHIT, 0);
@@ -431,10 +431,10 @@ void sceneHandler11_sub08() {
}
}
-void sceneHandler11_sub10(double angle) {
+void sceneHandler11_jumpOver(double angle) {
MGMInfo mgminfo;
- sceneHandler11_sub09();
+ sceneHandler11_emptySwing();
g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
MV_MAN11_JUMPOVER, 0);
@@ -464,10 +464,10 @@ void sceneHandler11_sub10(double angle) {
}
}
-void sceneHandler11_sub11(double angle) {
+void sceneHandler11_jumpHit(double angle) {
MGMInfo mgminfo;
- sceneHandler11_sub09();
+ sceneHandler11_emptySwing();
if (angle >= 0.0) {
if (angle > 1.0)
@@ -510,11 +510,11 @@ void sceneHandler11_swingLogic() {
int ph = g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex;
if (ph > 53 && ph < 90) {
if (ph < 70 && g_vars->scene11_var10 >= 22.0) {
- sceneHandler11_sub10((double)ph * 0.01428571428571429); // = 1 / 70
+ sceneHandler11_jumpOver((double)ph * 0.01428571428571429); // = 1 / 70
} else if (ph <= 80 && g_vars->scene11_var10 >= 22.0) {
- sceneHandler11_sub08();
+ sceneHandler11_jumpHitAndWin();
} else {
- sceneHandler11_sub11((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
+ sceneHandler11_jumpHit((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
}
g_vars->scene11_var02 = 0;
@@ -527,7 +527,7 @@ void sceneHandler11_swingLogic() {
}
}
-void sceneHandler11_sub05() {
+void sceneHandler11_setSwingDirection() {
if (g_vars->scene11_var17 == 2)
g_vars->scene11_var18 = 1;
else if (g_vars->scene11_var17 == 1)
@@ -536,7 +536,7 @@ void sceneHandler11_sub05() {
g_vars->scene11_var18 = (g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex <= 45) + 1;
}
-void sceneHandler11_sub06() {
+void sceneHandler11_swingieSit() {
if (g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots)) {
g_vars->scene11_var19 = 0;
g_vars->scene11_var20 = 0;
@@ -575,7 +575,7 @@ void sceneHandler11_winArcade() {
if (g_vars->scene11_var02) {
g_vars->scene11_var02 = 0;
- sceneHandler11_sub09();
+ sceneHandler11_emptySwing();
g_fp->_gameLoader->preloadScene(SC_11, TrubaRight);
}
@@ -659,7 +659,8 @@ int sceneHandler11(ExCommand *cmd) {
LABEL_27:
if (g_vars->scene11_var20) {
if (g_fp->_sceneRect.left >= 534 && g_vars->scene11_var06 < 534)
- sceneHandler11_sub06();
+ sceneHandler11_swingieSit();
+
g_vars->scene11_var06 = g_fp->_sceneRect.left;
}
@@ -755,7 +756,8 @@ int sceneHandler11(ExCommand *cmd) {
sceneHandler11_putBoot();
} else {
if (g_vars->scene11_var02) {
- sceneHandler11_sub05();
+ sceneHandler11_setSwingDirection();
+
g_vars->scene11_var16 = g_vars->scene11_var15;
}
}
Commit: 2c35897260d79d71d8cdcb04497a5d1a0994fe86
https://github.com/scummvm/scummvm/commit/2c35897260d79d71d8cdcb04497a5d1a0994fe86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:50-08:00
Commit Message:
FULLPIPE: Rename variables in scene11
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index cd816f1..31c7980 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -166,17 +166,17 @@ Vars::Vars() {
scene11_boots = 0;
scene11_dudeOnSwing = 0;
scene11_hint = 0;
- scene11_var02 = 0;
- scene11_var03 = 0;
- scene11_var04 = 0;
- scene11_var05 = 0;
- scene11_var06 = 0;
- scene11_var07 = 0;
- scene11_var08 = 1.0;
- scene11_var09 = 1.0;
- scene11_var10 = 1.0;
- scene11_var11 = 1.0;
- scene11_var12 = 0.0;
+ scene11_arcadeIsOn = false;
+ scene11_var03 = false;
+ scene11_var04 = false;
+ scene11_hintCounter = 0;
+ scene11_swingerScreenEdge = 0;
+ scene11_crySound = 0;
+ scene11_swingAngle = 1.0;
+ scene11_swingOldAngle = 1.0;
+ scene11_swingSpeed = 1.0;
+ scene11_swingAngleDiff = 1.0;
+ scene11_swingInertia = 0.0;
scene11_var13 = 0;
scene11_var14 = 0;
scene11_var15 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index cb6e45e..36cb9e2 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -229,18 +229,18 @@ public:
StaticANIObject *scene11_boots;
StaticANIObject *scene11_dudeOnSwing;
PictureObject *scene11_hint;
- MGM scene11_var01;
- int scene11_var02;
- int scene11_var03;
- int scene11_var04;
- int scene11_var05;
- int scene11_var06;
- int scene11_var07;
- double scene11_var08;
- double scene11_var09;
- double scene11_var10;
- double scene11_var11;
- double scene11_var12;
+ MGM scene11_mgm;
+ bool scene11_arcadeIsOn;
+ bool scene11_var03;
+ bool scene11_var04;
+ int scene11_hintCounter;
+ int scene11_swingerScreenEdge;
+ int scene11_crySound;
+ double scene11_swingAngle;
+ double scene11_swingOldAngle;
+ double scene11_swingSpeed;
+ double scene11_swingAngleDiff;
+ double scene11_swingInertia;
int scene11_var13;
int scene11_var14;
int scene11_var15;
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 3f4c8cd..84b6141 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -39,7 +39,7 @@ namespace Fullpipe {
void scene11_dudeSwingCallback(int *arg) {
int oldarg = *arg;
- *arg = 45 - (int)(g_vars->scene11_var08 * -29.66666666666666);
+ *arg = 45 - (int)(g_vars->scene11_swingAngle * -29.66666666666666);
if (*arg < 1)
*arg = 1;
@@ -47,40 +47,40 @@ void scene11_dudeSwingCallback(int *arg) {
if (*arg > 90)
*arg = 90;
- g_vars->scene11_var11 = (g_vars->scene11_var08 - g_vars->scene11_var09) * -490.0000000000001;
- g_vars->scene11_var10 = g_vars->scene11_var11 * 0.0042 + g_vars->scene11_var10 - g_vars->scene11_var12 * (g_vars->scene11_var11 * 0.0042 + g_vars->scene11_var10);
- g_vars->scene11_var08 = g_vars->scene11_var10 * 0.0042 + g_vars->scene11_var08;
+ g_vars->scene11_swingAngleDiff = (g_vars->scene11_swingAngle - g_vars->scene11_swingOldAngle) * -490.0000000000001;
+ g_vars->scene11_swingSpeed = g_vars->scene11_swingAngleDiff * 0.0042 + g_vars->scene11_swingSpeed - g_vars->scene11_swingInertia * (g_vars->scene11_swingAngleDiff * 0.0042 + g_vars->scene11_swingSpeed);
+ g_vars->scene11_swingAngle = g_vars->scene11_swingSpeed * 0.0042 + g_vars->scene11_swingAngle;
- if (g_vars->scene11_var08 < -1.5) {
- g_vars->scene11_var08 = 1.0004882812500000;
- g_vars->scene11_var10 = 1.0;
- g_vars->scene11_var11 = 1.0;
+ if (g_vars->scene11_swingAngle < -1.5) {
+ g_vars->scene11_swingAngle = 1.0004882812500000;
+ g_vars->scene11_swingSpeed = 1.0;
+ g_vars->scene11_swingAngleDiff = 1.0;
}
- if (g_vars->scene11_var08 > 1.5) {
- g_vars->scene11_var08 = 1.9990234375;
- g_vars->scene11_var10 = 1.0;
- g_vars->scene11_var11 = 1.0;
+ if (g_vars->scene11_swingAngle > 1.5) {
+ g_vars->scene11_swingAngle = 1.9990234375;
+ g_vars->scene11_swingSpeed = 1.0;
+ g_vars->scene11_swingAngleDiff = 1.0;
}
- if (g_vars->scene11_var23 == *arg && 0.0 != g_vars->scene11_var10 && fabs(g_vars->scene11_var10) < 2.5) {
- g_vars->scene11_var10 = 1.0;
- g_vars->scene11_var11 = 1.0;
- g_vars->scene11_var08 = g_vars->scene11_var09;
+ if (g_vars->scene11_var23 == *arg && 0.0 != g_vars->scene11_swingSpeed && fabs(g_vars->scene11_swingSpeed) < 2.5) {
+ g_vars->scene11_swingSpeed = 1.0;
+ g_vars->scene11_swingAngleDiff = 1.0;
+ g_vars->scene11_swingAngle = g_vars->scene11_swingOldAngle;
}
g_vars->scene11_var15++;
- if (g_vars->scene11_var02) {
- if (g_vars->scene11_var05 <= 720) {
- g_vars->scene11_var05++;
+ if (g_vars->scene11_arcadeIsOn) {
+ if (g_vars->scene11_hintCounter <= 720) {
+ g_vars->scene11_hintCounter++;
- if (g_vars->scene11_var05 == 720)
+ if (g_vars->scene11_hintCounter == 720)
g_vars->scene11_hint->_flags |= 4;
}
}
- if (oldarg - 45 >= 0 != *arg - 45 >= 0 && g_vars->scene11_var02) {
+ if (oldarg - 45 >= 0 != *arg - 45 >= 0 && g_vars->scene11_arcadeIsOn) {
if (oldarg >= *arg)
g_fp->playSound(SND_11_031, 0);
else
@@ -96,7 +96,7 @@ void scene11_setupMusic() {
void scene11_initScene(Scene *sc) {
g_vars->scene11_swingie = sc->getStaticANIObject1ById(ANI_SWINGER, -1);
g_vars->scene11_boots = sc->getStaticANIObject1ById(ANI_BOOTS_11, -1);
- g_vars->scene11_var01.clear();
+ g_vars->scene11_mgm.clear();
g_vars->scene11_dudeOnSwing = sc->getStaticANIObject1ById(ANI_MAN11, -1);
g_vars->scene11_dudeOnSwing->_callback2 = scene11_dudeSwingCallback;
g_vars->scene11_dudeOnSwing = sc->getStaticANIObject1ById(ANI_KACHELI, -1);
@@ -104,17 +104,17 @@ void scene11_initScene(Scene *sc) {
g_vars->scene11_hint = sc->getPictureObjectById(PIC_SC11_HINT, 0);
g_vars->scene11_hint->_flags &= 0xFFFB;
- g_vars->scene11_var02 = 0;
- g_vars->scene11_var03 = 0;
- g_vars->scene11_var04 = 0;
- g_vars->scene11_var05 = 0;
- g_vars->scene11_var06 = 0;
- g_vars->scene11_var07 = 0;
- g_vars->scene11_var08 = 1.0;
- g_vars->scene11_var09 = 1.0;
- g_vars->scene11_var10 = 1.0;
- g_vars->scene11_var11 = 1.0;
- g_vars->scene11_var12 = 1.9849218750000000;
+ g_vars->scene11_arcadeIsOn = false;
+ g_vars->scene11_var03 = false;
+ g_vars->scene11_var04 = false;
+ g_vars->scene11_hintCounter = 0;
+ g_vars->scene11_swingerScreenEdge = 0;
+ g_vars->scene11_crySound = 0;
+ g_vars->scene11_swingAngle = 1.0;
+ g_vars->scene11_swingOldAngle = 1.0;
+ g_vars->scene11_swingSpeed = 1.0;
+ g_vars->scene11_swingAngleDiff = 1.0;
+ g_vars->scene11_swingInertia = 1.9849218750000000;
g_vars->scene11_var13 = 0;
g_vars->scene11_var14 = 0;
g_vars->scene11_var15 = 0;
@@ -195,7 +195,7 @@ void sceneHandler11_restartMan() {
getGameLoaderInteractionController()->enableFlag24();
getCurrSceneSc2MotionController()->setEnabled();
- g_vars->scene11_var03 = 0;
+ g_vars->scene11_var03 = false;
}
void sceneHandler11_hitMan() {
@@ -215,7 +215,7 @@ void sceneHandler11_hitMan() {
int scene11_updateCursor() {
g_fp->updateCursorCommon();
- if (g_vars->scene11_var02) {
+ if (g_vars->scene11_arcadeIsOn) {
if (g_fp->_cursorId != PIC_CSR_DEFAULT_INV && g_fp->_cursorId != PIC_CSR_ITN_INV)
g_fp->_cursorId = -1;
} else if (g_vars->scene11_swingie == g_fp->_objectAtCursor && g_fp->_inventory->getSelectedItemId() == ANI_INV_BOOT)
@@ -225,7 +225,7 @@ int scene11_updateCursor() {
}
int sceneHandler11_updateScreenCallback() {
- int res = g_fp->drawArcadeOverlay(g_vars->scene11_var02);
+ int res = g_fp->drawArcadeOverlay(g_vars->scene11_arcadeIsOn);
if (!res)
g_fp->_updateScreenCallback = 0;
@@ -234,7 +234,7 @@ int sceneHandler11_updateScreenCallback() {
}
void sceneHandler11_manToSwing() {
- g_vars->scene11_var02 = 1;
+ g_vars->scene11_arcadeIsOn = true;
getCurrSceneSc2MotionController()->clearEnabled();
getGameLoaderInteractionController()->disableFlag24();
@@ -242,7 +242,7 @@ void sceneHandler11_manToSwing() {
g_fp->_aniMan2->hide();
g_vars->scene11_var15 = 0;
- g_vars->scene11_var12 = 1.9849218;
+ g_vars->scene11_swingInertia = 1.9849218;
g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN11, -1);
@@ -253,11 +253,11 @@ void sceneHandler11_manToSwing() {
g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_0, 0, -1);
g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(45);
- g_vars->scene11_var01.addItem(g_fp->_aniMan->_id);
+ g_vars->scene11_mgm.addItem(g_fp->_aniMan->_id);
g_fp->_currentScene->_x = 1400 - g_fp->_sceneRect.right;
- g_vars->scene11_var03 = 1;
+ g_vars->scene11_var03 = true;
g_fp->_updateScreenCallback = sceneHandler11_updateScreenCallback;
}
@@ -297,17 +297,17 @@ void sceneHandler11_showSwing() {
}
void sceneHandler11_jumpFromSwing() {
- g_vars->scene11_var02 = 0;
+ g_vars->scene11_arcadeIsOn = false;
g_vars->scene11_hint->_flags &= 0xFFFB;
- g_vars->scene11_var03 = 0;
+ g_vars->scene11_var03 = false;
getCurrSceneSc2MotionController()->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
- g_vars->scene11_var09 = 1.0;
- g_vars->scene11_var11 = 1.0;
- g_vars->scene11_var10 = 1.0;
- g_vars->scene11_var08 = 1.0;
+ g_vars->scene11_swingOldAngle = 1.0;
+ g_vars->scene11_swingAngleDiff = 1.0;
+ g_vars->scene11_swingSpeed = 1.0;
+ g_vars->scene11_swingAngle = 1.0;
g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN11, -1);
g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
@@ -344,7 +344,7 @@ void sceneHandler11_swing0() {
g_vars->scene11_var17 = 0;
g_vars->scene11_var23 = 45;
- g_vars->scene11_var09 = 1.0;
+ g_vars->scene11_swingOldAngle = 1.0;
}
void sceneHandler11_swing1() {
@@ -356,7 +356,7 @@ void sceneHandler11_swing1() {
g_vars->scene11_var17 = 1;
g_vars->scene11_var23 = 42;
- g_vars->scene11_var09 = -(fabs(g_vars->scene11_var08) * 0.075 + 0.12);
+ g_vars->scene11_swingOldAngle = -(fabs(g_vars->scene11_swingAngle) * 0.075 + 0.12);
}
void sceneHandler11_swing2() {
@@ -368,7 +368,7 @@ void sceneHandler11_swing2() {
g_vars->scene11_var17 = 2;
g_vars->scene11_var23 = 48;
- g_vars->scene11_var09 = fabs(g_vars->scene11_var08) * 0.075 + 0.12;
+ g_vars->scene11_swingOldAngle = fabs(g_vars->scene11_swingAngle) * 0.075 + 0.12;
}
void sceneHandler11_emptySwing() {
@@ -383,7 +383,7 @@ void sceneHandler11_emptySwing() {
g_vars->scene11_dudeOnSwing->startAnim(MV_KCH_MOVE2, 0, -1);
g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
- g_vars->scene11_var12 = 1.9881250;
+ g_vars->scene11_swingInertia = 1.9881250;
}
void sceneHandler11_jumpHitAndWin() {
@@ -391,7 +391,7 @@ void sceneHandler11_jumpHitAndWin() {
sceneHandler11_emptySwing();
- g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_swingAngle) * -267.0), 215 - (int)(cos(g_vars->scene11_swingAngle) * -267.0),
MV_MAN11_JUMPHIT, 0);
g_fp->_aniMan->_priority = 10;
@@ -404,10 +404,10 @@ void sceneHandler11_jumpHitAndWin() {
mgminfo.flags = 66;
mgminfo.movementId = MV_MAN11_JUMPHIT;
- MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+ MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
if (mq) {
- g_vars->scene11_var07 = SND_11_024;
+ g_vars->scene11_crySound = SND_11_024;
ExCommand *ex = new ExCommand(ANI_MAN, 2, 36, 0, 0, 0, 1, 0, 0, 0);
ex->_keyCode = -1;
ex->_excFlags = 2;
@@ -436,7 +436,7 @@ void sceneHandler11_jumpOver(double angle) {
sceneHandler11_emptySwing();
- g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_swingAngle) * -267.0), 215 - (int)(cos(g_vars->scene11_swingAngle) * -267.0),
MV_MAN11_JUMPOVER, 0);
g_fp->_aniMan->_priority = 0;
@@ -449,10 +449,10 @@ void sceneHandler11_jumpOver(double angle) {
mgminfo.flags = 78;
mgminfo.movementId = MV_MAN11_JUMPOVER;
- MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+ MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
if (mq) {
- g_vars->scene11_var07 = SND_11_022;
+ g_vars->scene11_crySound = SND_11_022;
ExCommand *ex = new ExCommand(0, 17, MSG_SC11_RESTARTMAN, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags = 2;
@@ -476,7 +476,7 @@ void sceneHandler11_jumpHit(double angle) {
angle = 0.0;
}
- g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_swingAngle) * -267.0), 215 - (int)(cos(g_vars->scene11_swingAngle) * -267.0),
MV_MAN11_JUMPOVER, 0);
g_fp->_aniMan->_priority = 0;
@@ -489,10 +489,10 @@ void sceneHandler11_jumpHit(double angle) {
mgminfo.flags = 78;
mgminfo.movementId = MV_MAN11_JUMPHIT;
- MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+ MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
if (mq) {
- g_vars->scene11_var07 = SND_11_022;
+ g_vars->scene11_crySound = SND_11_022;
ExCommand *ex = new ExCommand(0, 17, MSG_SC11_RESTARTMAN, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags = 2;
@@ -509,20 +509,20 @@ void sceneHandler11_swingLogic() {
if (g_vars->scene11_dudeOnSwing->_movement) {
int ph = g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex;
if (ph > 53 && ph < 90) {
- if (ph < 70 && g_vars->scene11_var10 >= 22.0) {
+ if (ph < 70 && g_vars->scene11_swingSpeed >= 22.0) {
sceneHandler11_jumpOver((double)ph * 0.01428571428571429); // = 1 / 70
- } else if (ph <= 80 && g_vars->scene11_var10 >= 22.0) {
+ } else if (ph <= 80 && g_vars->scene11_swingSpeed >= 22.0) {
sceneHandler11_jumpHitAndWin();
} else {
- sceneHandler11_jumpHit((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
+ sceneHandler11_jumpHit((double)ph * g_vars->scene11_swingSpeed * 0.0006493506493506494); // = 1/1540
}
- g_vars->scene11_var02 = 0;
+ g_vars->scene11_arcadeIsOn = false;
g_vars->scene11_hint->_flags &= 0xFFFB;
return;
}
- if (ph > 38 && ph < 53 && fabs(g_vars->scene11_var10) <= 5.0)
+ if (ph > 38 && ph < 53 && fabs(g_vars->scene11_swingSpeed) <= 5.0)
sceneHandler11_jumpFromSwing();
}
}
@@ -562,7 +562,7 @@ void sceneHandler11_swingerJumpDown() {
g_vars->scene11_var19 = 0;
g_vars->scene11_var20 = 1;
- g_vars->scene11_var06 = g_fp->_sceneRect.left;
+ g_vars->scene11_swingerScreenEdge = g_fp->_sceneRect.left;
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing1, 0);
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing2, 1);
@@ -572,8 +572,8 @@ void sceneHandler11_swingerJumpDown() {
}
void sceneHandler11_winArcade() {
- if (g_vars->scene11_var02) {
- g_vars->scene11_var02 = 0;
+ if (g_vars->scene11_arcadeIsOn) {
+ g_vars->scene11_arcadeIsOn = false;
sceneHandler11_emptySwing();
@@ -598,9 +598,9 @@ int sceneHandler11(ExCommand *cmd) {
break;
case MSG_SC11_MANCRY:
- g_fp->playSound(g_vars->scene11_var07, 0);
+ g_fp->playSound(g_vars->scene11_crySound, 0);
- g_vars->scene11_var07 = 0;
+ g_vars->scene11_crySound = 0;
break;
case MSG_SC11_RESTARTMAN:
@@ -624,7 +624,7 @@ int sceneHandler11(ExCommand *cmd) {
break;
case 107:
- if (g_vars->scene11_var02)
+ if (g_vars->scene11_arcadeIsOn)
sceneHandler11_swingLogic();
break;
@@ -652,19 +652,19 @@ int sceneHandler11(ExCommand *cmd) {
g_fp->_currentScene->_x = g_fp->_sceneWidth - x;
if (g_vars->scene11_var21 < 910)
- g_vars->scene11_var04 = 0;
+ g_vars->scene11_var04 = false;
LABEL_26:
res = 1;
LABEL_27:
if (g_vars->scene11_var20) {
- if (g_fp->_sceneRect.left >= 534 && g_vars->scene11_var06 < 534)
+ if (g_fp->_sceneRect.left >= 534 && g_vars->scene11_swingerScreenEdge < 534)
sceneHandler11_swingieSit();
- g_vars->scene11_var06 = g_fp->_sceneRect.left;
+ g_vars->scene11_swingerScreenEdge = g_fp->_sceneRect.left;
}
- if (!g_vars->scene11_var02)
+ if (!g_vars->scene11_arcadeIsOn)
goto LABEL_50;
if (g_vars->scene11_var16 <= 0 || g_vars->scene11_var15 - g_vars->scene11_var16 <= 72) {
@@ -674,22 +674,22 @@ int sceneHandler11(ExCommand *cmd) {
g_vars->scene11_var16 = 0;
}
- if (!g_vars->scene11_var02)
+ if (!g_vars->scene11_arcadeIsOn)
goto LABEL_50;
if (g_vars->scene11_var17 == g_vars->scene11_var18 || g_vars->scene11_var16 <= 0 || g_vars->scene11_var15 - g_vars->scene11_var16 <= 2) {
LABEL_49:
- if (g_vars->scene11_var02) {
+ if (g_vars->scene11_arcadeIsOn) {
g_fp->_behaviorManager->updateBehaviors();
g_fp->startSceneTrack();
return res;
}
LABEL_50:
if (g_vars->scene11_var19
- || (0.0 == g_vars->scene11_var10
+ || (0.0 == g_vars->scene11_swingSpeed
&& g_vars->scene11_dudeOnSwing->_movement != 0
&& g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex == 45
- && (g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_STATIC), !g_vars->scene11_var02)
+ && (g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_STATIC), !g_vars->scene11_arcadeIsOn)
&& g_vars->scene11_var19)) {
if (!g_vars->scene11_swingie->_movement) {
if ((g_vars->scene11_boots->_flags & 4) && g_vars->scene11_boots->_statics->_staticsId == ST_BTS11_2) {
@@ -735,7 +735,7 @@ int sceneHandler11(ExCommand *cmd) {
x = g_vars->scene11_var21;
}
if (x >= 940)
- g_vars->scene11_var04 = 1;
+ g_vars->scene11_var04 = true;
goto LABEL_26;
}
g_fp->_currentScene->_x = x - g_fp->_sceneRect.right + 300;
@@ -755,14 +755,14 @@ int sceneHandler11(ExCommand *cmd) {
&& cmd->_keyCode == ANI_INV_BOOT)
sceneHandler11_putBoot();
} else {
- if (g_vars->scene11_var02) {
+ if (g_vars->scene11_arcadeIsOn) {
sceneHandler11_setSwingDirection();
g_vars->scene11_var16 = g_vars->scene11_var15;
}
}
- if (!g_vars->scene11_var02) {
+ if (!g_vars->scene11_arcadeIsOn) {
StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY);
if (!ani || !canInteractAny(g_fp->_aniMan, ani, cmd->_keyCode)) {
Commit: 9a5e5c25894fa65a6476a0bab795133735a44d8b
https://github.com/scummvm/scummvm/commit/9a5e5c25894fa65a6476a0bab795133735a44d8b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T04:17:50-08:00
Commit Message:
FULLPIPE: Renames in scene11. This completes the scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 31c7980..0a83d1b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -167,27 +167,25 @@ Vars::Vars() {
scene11_dudeOnSwing = 0;
scene11_hint = 0;
scene11_arcadeIsOn = false;
- scene11_var03 = false;
- scene11_var04 = false;
+ scene11_scrollIsEnabled = false;
+ scene11_scrollIsMaximized = false;
scene11_hintCounter = 0;
- scene11_swingerScreenEdge = 0;
+ scene11_swingieScreenEdge = 0;
scene11_crySound = 0;
scene11_swingAngle = 1.0;
scene11_swingOldAngle = 1.0;
scene11_swingSpeed = 1.0;
scene11_swingAngleDiff = 1.0;
scene11_swingInertia = 0.0;
- scene11_var13 = 0;
- scene11_var14 = 0;
- scene11_var15 = 0;
- scene11_var16 = 0;
- scene11_var17 = 0;
- scene11_var18 = 0;
- scene11_var19 = 0;
- scene11_var20 = 0;
- scene11_var21 = 0;
- scene11_var22 = 0;
- scene11_var23 = 45;
+ scene11_swingCounter = 0;
+ scene11_swingCounterPrevTurn = 0;
+ scene11_swingDirection = 0;
+ scene11_swingDirectionPrevTurn = 0;
+ scene11_swingIsSwinging = false;
+ scene11_swingieStands = false;
+ scene11_dudeX = 0;
+ scene11_dudeY = 0;
+ scene11_swingMaxAngle = 45;
scene12_fly = 0;
scene12_flyCountdown = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 36cb9e2..281e350 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -231,27 +231,25 @@ public:
PictureObject *scene11_hint;
MGM scene11_mgm;
bool scene11_arcadeIsOn;
- bool scene11_var03;
- bool scene11_var04;
+ bool scene11_scrollIsEnabled;
+ bool scene11_scrollIsMaximized;
int scene11_hintCounter;
- int scene11_swingerScreenEdge;
+ int scene11_swingieScreenEdge;
int scene11_crySound;
double scene11_swingAngle;
double scene11_swingOldAngle;
double scene11_swingSpeed;
double scene11_swingAngleDiff;
double scene11_swingInertia;
- int scene11_var13;
- int scene11_var14;
- int scene11_var15;
- int scene11_var16;
- int scene11_var17;
- int scene11_var18;
- int scene11_var19;
- int scene11_var20;
- int scene11_var21;
- int scene11_var22;
- int scene11_var23;
+ int scene11_swingCounter;
+ int scene11_swingCounterPrevTurn;
+ int scene11_swingDirection;
+ int scene11_swingDirectionPrevTurn;
+ bool scene11_swingIsSwinging;
+ bool scene11_swingieStands;
+ int scene11_dudeX;
+ int scene11_dudeY;
+ int scene11_swingMaxAngle;
int scene12_fly;
int scene12_flyCountdown;
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 84b6141..7629252 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -63,13 +63,13 @@ void scene11_dudeSwingCallback(int *arg) {
g_vars->scene11_swingAngleDiff = 1.0;
}
- if (g_vars->scene11_var23 == *arg && 0.0 != g_vars->scene11_swingSpeed && fabs(g_vars->scene11_swingSpeed) < 2.5) {
+ if (g_vars->scene11_swingMaxAngle == *arg && 0.0 != g_vars->scene11_swingSpeed && fabs(g_vars->scene11_swingSpeed) < 2.5) {
g_vars->scene11_swingSpeed = 1.0;
g_vars->scene11_swingAngleDiff = 1.0;
g_vars->scene11_swingAngle = g_vars->scene11_swingOldAngle;
}
- g_vars->scene11_var15++;
+ g_vars->scene11_swingCounter++;
if (g_vars->scene11_arcadeIsOn) {
if (g_vars->scene11_hintCounter <= 720) {
@@ -105,22 +105,20 @@ void scene11_initScene(Scene *sc) {
g_vars->scene11_hint->_flags &= 0xFFFB;
g_vars->scene11_arcadeIsOn = false;
- g_vars->scene11_var03 = false;
- g_vars->scene11_var04 = false;
+ g_vars->scene11_scrollIsEnabled = false;
+ g_vars->scene11_scrollIsMaximized = false;
g_vars->scene11_hintCounter = 0;
- g_vars->scene11_swingerScreenEdge = 0;
+ g_vars->scene11_swingieScreenEdge = 0;
g_vars->scene11_crySound = 0;
g_vars->scene11_swingAngle = 1.0;
g_vars->scene11_swingOldAngle = 1.0;
g_vars->scene11_swingSpeed = 1.0;
g_vars->scene11_swingAngleDiff = 1.0;
g_vars->scene11_swingInertia = 1.9849218750000000;
- g_vars->scene11_var13 = 0;
- g_vars->scene11_var14 = 0;
- g_vars->scene11_var15 = 0;
- g_vars->scene11_var16 = 0;
- g_vars->scene11_var17 = 0;
- g_vars->scene11_var18 = 0;
+ g_vars->scene11_swingCounter = 0;
+ g_vars->scene11_swingCounterPrevTurn = 0;
+ g_vars->scene11_swingDirection = 0;
+ g_vars->scene11_swingDirectionPrevTurn = 0;
Scene *oldsc = g_fp->_currentScene;
@@ -130,8 +128,8 @@ void scene11_initScene(Scene *sc) {
if (swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsSwinging)
|| swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsSwingingWithBoot)) {
- g_vars->scene11_var19 = 1;
- g_vars->scene11_var20 = 0;
+ g_vars->scene11_swingIsSwinging = true;
+ g_vars->scene11_swingieStands = false;
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing1, 1);
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing2, 1);
@@ -142,8 +140,8 @@ void scene11_initScene(Scene *sc) {
getSc2MctlCompoundBySceneId(sc->_sceneId)->replaceNodeX(303, 353);
} else if (swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots)
|| swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner)) {
- g_vars->scene11_var19 = 0;
- g_vars->scene11_var20 = 1;
+ g_vars->scene11_swingIsSwinging = false;
+ g_vars->scene11_swingieStands = true;
g_vars->scene11_swingie->changeStatics2(ST_SWR_STAND3);
@@ -153,8 +151,8 @@ void scene11_initScene(Scene *sc) {
((MctlCompound *)getCurrSceneSc2MotionController())->replaceNodeX(905, 805);
} else {
- g_vars->scene11_var19 = 0;
- g_vars->scene11_var20 = 0;
+ g_vars->scene11_swingIsSwinging = false;
+ g_vars->scene11_swingieStands = false;
if (swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsSitting)) {
g_vars->scene11_swingie->_movement = 0;
@@ -175,7 +173,7 @@ void scene11_initScene(Scene *sc) {
}
}
- if (!g_vars->scene11_var19) {
+ if (!g_vars->scene11_swingIsSwinging) {
g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_STATIC);
g_vars->scene11_dudeOnSwing->setOXY(691, 371);
g_vars->scene11_dudeOnSwing->_priority = 20;
@@ -195,7 +193,7 @@ void sceneHandler11_restartMan() {
getGameLoaderInteractionController()->enableFlag24();
getCurrSceneSc2MotionController()->setEnabled();
- g_vars->scene11_var03 = false;
+ g_vars->scene11_scrollIsEnabled = false;
}
void sceneHandler11_hitMan() {
@@ -241,7 +239,7 @@ void sceneHandler11_manToSwing() {
g_fp->_aniMan2->hide();
- g_vars->scene11_var15 = 0;
+ g_vars->scene11_swingCounter = 0;
g_vars->scene11_swingInertia = 1.9849218;
g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
@@ -257,7 +255,7 @@ void sceneHandler11_manToSwing() {
g_fp->_currentScene->_x = 1400 - g_fp->_sceneRect.right;
- g_vars->scene11_var03 = true;
+ g_vars->scene11_scrollIsEnabled = true;
g_fp->_updateScreenCallback = sceneHandler11_updateScreenCallback;
}
@@ -299,7 +297,7 @@ void sceneHandler11_showSwing() {
void sceneHandler11_jumpFromSwing() {
g_vars->scene11_arcadeIsOn = false;
g_vars->scene11_hint->_flags &= 0xFFFB;
- g_vars->scene11_var03 = false;
+ g_vars->scene11_scrollIsEnabled = false;
getCurrSceneSc2MotionController()->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
@@ -342,8 +340,8 @@ void sceneHandler11_swing0() {
g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_0, 0, -1);
g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
- g_vars->scene11_var17 = 0;
- g_vars->scene11_var23 = 45;
+ g_vars->scene11_swingDirection = 0;
+ g_vars->scene11_swingMaxAngle = 45;
g_vars->scene11_swingOldAngle = 1.0;
}
@@ -354,8 +352,8 @@ void sceneHandler11_swing1() {
g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_1, 0, -1);
g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
- g_vars->scene11_var17 = 1;
- g_vars->scene11_var23 = 42;
+ g_vars->scene11_swingDirection = 1;
+ g_vars->scene11_swingMaxAngle = 42;
g_vars->scene11_swingOldAngle = -(fabs(g_vars->scene11_swingAngle) * 0.075 + 0.12);
}
@@ -366,13 +364,13 @@ void sceneHandler11_swing2() {
g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_2, 0, -1);
g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
- g_vars->scene11_var17 = 2;
- g_vars->scene11_var23 = 48;
+ g_vars->scene11_swingDirection = 2;
+ g_vars->scene11_swingMaxAngle = 48;
g_vars->scene11_swingOldAngle = fabs(g_vars->scene11_swingAngle) * 0.075 + 0.12;
}
void sceneHandler11_emptySwing() {
- if (g_vars->scene11_var17)
+ if (g_vars->scene11_swingDirection)
sceneHandler11_swing0();
g_vars->scene11_dudeOnSwing->stopAnim_maybe();
@@ -528,18 +526,18 @@ void sceneHandler11_swingLogic() {
}
void sceneHandler11_setSwingDirection() {
- if (g_vars->scene11_var17 == 2)
- g_vars->scene11_var18 = 1;
- else if (g_vars->scene11_var17 == 1)
- g_vars->scene11_var18 = 2;
+ if (g_vars->scene11_swingDirection == 2)
+ g_vars->scene11_swingDirectionPrevTurn = 1;
+ else if (g_vars->scene11_swingDirection == 1)
+ g_vars->scene11_swingDirectionPrevTurn = 2;
else
- g_vars->scene11_var18 = (g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex <= 45) + 1;
+ g_vars->scene11_swingDirectionPrevTurn = (g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex <= 45) + 1;
}
void sceneHandler11_swingieSit() {
if (g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots)) {
- g_vars->scene11_var19 = 0;
- g_vars->scene11_var20 = 0;
+ g_vars->scene11_swingIsSwinging = false;
+ g_vars->scene11_swingieStands = false;
g_vars->scene11_swingie->changeStatics2(ST_SWR_SIT);
g_vars->scene11_swingie->setOXY(144, 389);
@@ -552,7 +550,7 @@ void sceneHandler11_swingieSit() {
}
}
-void sceneHandler11_swingerJumpDown() {
+void sceneHandler11_swingieJumpDown() {
MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SWR_JUMPDOWN), 0, 0);
mq->setFlags(mq->getFlags() | 1);
@@ -560,9 +558,9 @@ void sceneHandler11_swingerJumpDown() {
if (!mq->chain(g_vars->scene11_swingie))
delete mq;
- g_vars->scene11_var19 = 0;
- g_vars->scene11_var20 = 1;
- g_vars->scene11_swingerScreenEdge = g_fp->_sceneRect.left;
+ g_vars->scene11_swingIsSwinging = false;
+ g_vars->scene11_swingieStands = true;
+ g_vars->scene11_swingieScreenEdge = g_fp->_sceneRect.left;
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing1, 0);
getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing2, 1);
@@ -639,45 +637,45 @@ int sceneHandler11(ExCommand *cmd) {
x = g_fp->_aniMan2->_ox;
y = g_fp->_aniMan2->_oy;
- g_vars->scene11_var21 = x;
- g_vars->scene11_var22 = y;
+ g_vars->scene11_dudeX = x;
+ g_vars->scene11_dudeY = y;
- if (g_vars->scene11_var03) {
+ if (g_vars->scene11_scrollIsEnabled) {
if (x > g_fp->_sceneRect.right - 200)
g_fp->_currentScene->_x = x - g_fp->_sceneRect.right + 300;
goto LABEL_26;
}
- if (g_vars->scene11_var04) {
+ if (g_vars->scene11_scrollIsMaximized) {
g_fp->_currentScene->_x = g_fp->_sceneWidth - x;
- if (g_vars->scene11_var21 < 910)
- g_vars->scene11_var04 = false;
+ if (g_vars->scene11_dudeX < 910)
+ g_vars->scene11_scrollIsMaximized = false;
LABEL_26:
res = 1;
LABEL_27:
- if (g_vars->scene11_var20) {
- if (g_fp->_sceneRect.left >= 534 && g_vars->scene11_swingerScreenEdge < 534)
+ if (g_vars->scene11_swingieStands) {
+ if (g_fp->_sceneRect.left >= 534 && g_vars->scene11_swingieScreenEdge < 534)
sceneHandler11_swingieSit();
- g_vars->scene11_swingerScreenEdge = g_fp->_sceneRect.left;
+ g_vars->scene11_swingieScreenEdge = g_fp->_sceneRect.left;
}
if (!g_vars->scene11_arcadeIsOn)
goto LABEL_50;
- if (g_vars->scene11_var16 <= 0 || g_vars->scene11_var15 - g_vars->scene11_var16 <= 72) {
+ if (g_vars->scene11_swingCounterPrevTurn <= 0 || g_vars->scene11_swingCounter - g_vars->scene11_swingCounterPrevTurn <= 72) {
} else {
sceneHandler11_swing0();
- g_vars->scene11_var18 = 0;
- g_vars->scene11_var16 = 0;
+ g_vars->scene11_swingDirectionPrevTurn = 0;
+ g_vars->scene11_swingCounterPrevTurn = 0;
}
if (!g_vars->scene11_arcadeIsOn)
goto LABEL_50;
- if (g_vars->scene11_var17 == g_vars->scene11_var18 || g_vars->scene11_var16 <= 0 || g_vars->scene11_var15 - g_vars->scene11_var16 <= 2) {
+ if (g_vars->scene11_swingDirection == g_vars->scene11_swingDirectionPrevTurn || g_vars->scene11_swingCounterPrevTurn <= 0 || g_vars->scene11_swingCounter - g_vars->scene11_swingCounterPrevTurn <= 2) {
LABEL_49:
if (g_vars->scene11_arcadeIsOn) {
g_fp->_behaviorManager->updateBehaviors();
@@ -685,15 +683,15 @@ int sceneHandler11(ExCommand *cmd) {
return res;
}
LABEL_50:
- if (g_vars->scene11_var19
+ if (g_vars->scene11_swingIsSwinging
|| (0.0 == g_vars->scene11_swingSpeed
&& g_vars->scene11_dudeOnSwing->_movement != 0
&& g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex == 45
&& (g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_STATIC), !g_vars->scene11_arcadeIsOn)
- && g_vars->scene11_var19)) {
+ && g_vars->scene11_swingIsSwinging)) {
if (!g_vars->scene11_swingie->_movement) {
if ((g_vars->scene11_boots->_flags & 4) && g_vars->scene11_boots->_statics->_staticsId == ST_BTS11_2) {
- sceneHandler11_swingerJumpDown();
+ sceneHandler11_swingieJumpDown();
g_fp->_behaviorManager->updateBehaviors();
g_fp->startSceneTrack();
@@ -707,19 +705,19 @@ int sceneHandler11(ExCommand *cmd) {
return res;
}
- if (g_vars->scene11_var18 == 1) {
- if (!g_vars->scene11_var17)
+ if (g_vars->scene11_swingDirectionPrevTurn == 1) {
+ if (!g_vars->scene11_swingDirection)
sceneHandler11_swing1();
else
sceneHandler11_swing0();
- } else if (g_vars->scene11_var18 == 2) {
- if (!g_vars->scene11_var17)
+ } else if (g_vars->scene11_swingDirectionPrevTurn == 2) {
+ if (!g_vars->scene11_swingDirection)
sceneHandler11_swing2();
else
sceneHandler11_swing0();
}
- g_vars->scene11_var16 = g_vars->scene11_var15;
+ g_vars->scene11_swingCounterPrevTurn = g_vars->scene11_swingCounter;
goto LABEL_49;
}
if (x >= g_fp->_sceneRect.left + 200) {
@@ -727,30 +725,30 @@ int sceneHandler11(ExCommand *cmd) {
LABEL_18:
if (y < g_fp->_sceneRect.top + 200) {
g_fp->_currentScene->_y = y - g_fp->_sceneRect.top - 300;
- y = g_vars->scene11_var22;
- x = g_vars->scene11_var21;
+ y = g_vars->scene11_dudeY;
+ x = g_vars->scene11_dudeX;
}
if (y > g_fp->_sceneRect.bottom - 300) {
//g_fp->_currentScene->_y = y - g_fp->_sceneRect.bottom + 300; // FIXME. Causes flicker
- x = g_vars->scene11_var21;
+ x = g_vars->scene11_dudeX;
}
if (x >= 940)
- g_vars->scene11_var04 = true;
+ g_vars->scene11_scrollIsMaximized = true;
goto LABEL_26;
}
g_fp->_currentScene->_x = x - g_fp->_sceneRect.right + 300;
} else {
g_fp->_currentScene->_x = x - g_fp->_sceneRect.left - 300;
}
- y = g_vars->scene11_var22;
- x = g_vars->scene11_var21;
+ y = g_vars->scene11_dudeY;
+ x = g_vars->scene11_dudeX;
goto LABEL_18;
}
break;
case 29:
- if (g_vars->scene11_var19) {
+ if (g_vars->scene11_swingIsSwinging) {
if (g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y) == g_vars->scene11_swingie
&& cmd->_keyCode == ANI_INV_BOOT)
sceneHandler11_putBoot();
@@ -758,7 +756,7 @@ int sceneHandler11(ExCommand *cmd) {
if (g_vars->scene11_arcadeIsOn) {
sceneHandler11_setSwingDirection();
- g_vars->scene11_var16 = g_vars->scene11_var15;
+ g_vars->scene11_swingCounterPrevTurn = g_vars->scene11_swingCounter;
}
}
More information about the Scummvm-git-logs
mailing list