[Scummvm-git-logs] scummvm master -> d059f3b7d661dc8d080880e85e408a75f273714e
sev-
sev at scummvm.org
Tue Sep 13 10:49:46 CEST 2016
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aeba8ef917 FULLPIPE: Clarified ball variable names in scene29
35c57ee8c2 FULLPIPE: Fix red ball handling in scene29
d059f3b7d6 FULLPIPE: Added more debug to scene29
Commit: aeba8ef917b406cb1155ed567588838d621c9f67
https://github.com/scummvm/scummvm/commit/aeba8ef917b406cb1155ed567588838d621c9f67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-13T10:12:23+02:00
Commit Message:
FULLPIPE: Clarified ball variable names in scene29
Changed paths:
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene29.cpp
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index ad5a2aa..43bdb38 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -597,10 +597,10 @@ public:
StaticANIObject *scene29_shooter1;
StaticANIObject *scene29_shooter2;
StaticANIObject *scene29_ass;
- Common::Array<StaticANIObject *> scene29_balls;
+ Common::Array<StaticANIObject *> scene29_greenBalls;
Common::Array<StaticANIObject *> scene29_redBalls;
Common::Array<StaticANIObject *> scene29_flyingRedBalls;
- Common::Array<StaticANIObject *> scene29_greenBalls;
+ Common::Array<StaticANIObject *> scene29_flyingGreenBalls;
bool scene29_manIsRiding;
bool scene29_arcadeIsOn;
bool scene29_reachedFarRight;
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index f977d97..aa1db83 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -48,18 +48,18 @@ void scene29_initScene(Scene *sc) {
g_vars->scene29_shooter2 = sc->getStaticANIObject1ById(ANI_SHOOTER2, -1);
g_vars->scene29_ass = sc->getStaticANIObject1ById(ANI_ASS, -1);
- g_vars->scene29_balls.clear();
g_vars->scene29_greenBalls.clear();
+ g_vars->scene29_flyingGreenBalls.clear();
StaticANIObject *ani = sc->getStaticANIObject1ById(ANI_SHELL_GREEN, -1);
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
for (int i = 0; i < 2; i++) {
StaticANIObject *newani = new StaticANIObject(ani);
sc->addStaticANIObject(newani, 1);
- g_vars->scene29_balls.push_back(newani);
+ g_vars->scene29_greenBalls.push_back(newani);
}
g_vars->scene29_redBalls.clear();
@@ -118,11 +118,11 @@ void sceneHandler29_winArcade() {
StaticANIObject *ani;
- while (g_vars->scene29_greenBalls.size()) {
- ani = g_vars->scene29_greenBalls.front();
- g_vars->scene29_greenBalls.remove_at(0);
+ while (g_vars->scene29_flyingGreenBalls.size()) {
+ ani = g_vars->scene29_flyingGreenBalls.front();
+ g_vars->scene29_flyingGreenBalls.remove_at(0);
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
ani->hide();
}
@@ -131,7 +131,7 @@ void sceneHandler29_winArcade() {
ani = g_vars->scene29_flyingRedBalls.front();
g_vars->scene29_flyingRedBalls.remove_at(0);
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
ani->hide();
}
@@ -146,25 +146,25 @@ void sceneHandler29_winArcade() {
}
void sceneHandler29_shootGreen() {
- if (g_vars->scene29_balls.size()) {
+ if (g_vars->scene29_greenBalls.size()) {
int x = g_vars->scene29_shooter1->_ox - 113;
int y = g_vars->scene29_shooter1->_oy - 48;
- StaticANIObject *ani = g_vars->scene29_balls.front();
- g_vars->scene29_balls.remove_at(0);
+ StaticANIObject *ani = g_vars->scene29_greenBalls.front();
+ g_vars->scene29_greenBalls.remove_at(0);
ani->show1(x, y, MV_SHG_NORM, 0);
ani->_priority = 5;
- g_vars->scene29_greenBalls.push_back(ani);
+ g_vars->scene29_flyingGreenBalls.push_back(ani);
}
}
void sceneHandler29_shootRed() {
- if (g_vars->scene29_balls.size()) {
+ if (g_vars->scene29_greenBalls.size()) {
int x = g_vars->scene29_shooter1->_ox - 101;
int y = g_vars->scene29_shooter1->_oy - 14;
- StaticANIObject *ani = g_vars->scene29_balls.front();
- g_vars->scene29_balls.remove_at(0);
+ StaticANIObject *ani = g_vars->scene29_greenBalls.front();
+ g_vars->scene29_greenBalls.remove_at(0);
ani->show1(x, y, MV_SHR_NORM, 0);
ani->_priority = 5;
@@ -321,17 +321,17 @@ void sceneHandler29_assHitGreen() {
void sceneHandler29_ballHitCheck() {
int x, y;
- for (int i = (int)g_vars->scene29_greenBalls.size() - 1; i >= 0; i--) {
- StaticANIObject *ani = g_vars->scene29_greenBalls[i];
+ for (int i = (int)g_vars->scene29_flyingGreenBalls.size() - 1; i >= 0; i--) {
+ StaticANIObject *ani = g_vars->scene29_flyingGreenBalls[i];
x = ani->_ox - 30;
y = ani->_oy;
if (x >= 186) {
if (sceneHandler29_checkGreenBallHit(ani, x)) {
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
- g_vars->scene29_greenBalls.remove_at(i);
+ g_vars->scene29_flyingGreenBalls.remove_at(i);
sceneHandler29_manHit();
@@ -344,11 +344,11 @@ void sceneHandler29_ballHitCheck() {
ani->setOXY(x, y);
}
} else {
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
ani->hide();
- g_vars->scene29_greenBalls.remove_at(i);
+ g_vars->scene29_flyingGreenBalls.remove_at(i);
sceneHandler29_assHitGreen();
}
@@ -362,7 +362,7 @@ void sceneHandler29_ballHitCheck() {
if (x >= 147) {
if (sceneHandler29_checkRedBallHit(ani, x)) {
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
g_vars->scene29_flyingRedBalls.remove_at(i);
@@ -377,7 +377,7 @@ void sceneHandler29_ballHitCheck() {
ani->setOXY(x, y);
}
} else {
- g_vars->scene29_balls.push_back(ani);
+ g_vars->scene29_greenBalls.push_back(ani);
ani->hide();
@@ -675,7 +675,7 @@ int sceneHandler29(ExCommand *cmd) {
break;
case MSG_SC29_SHOWLASTRED:
- if (g_vars->scene29_redBalls.size()) { // original uses scene29_balls which looks like a copy/paste error
+ if (g_vars->scene29_redBalls.size()) { // original uses scene29_greenBalls which looks like a copy/paste error
g_vars->scene29_redBalls.back()->show1(-1, -1, -1, 0);
g_vars->scene29_redBalls.back()->startAnim(MV_SHR_HITASS, 0, -1);
}
@@ -691,9 +691,9 @@ int sceneHandler29(ExCommand *cmd) {
break;
case MSG_SC29_SHOWLASTGREEN:
- if (g_vars->scene29_balls.size()) {
- g_vars->scene29_balls.back()->show1(-1, -1, -1, 0);
- g_vars->scene29_balls.back()->startAnim(MV_SHG_HITASS, 0, -1);
+ if (g_vars->scene29_greenBalls.size()) {
+ g_vars->scene29_greenBalls.back()->show1(-1, -1, -1, 0);
+ g_vars->scene29_greenBalls.back()->startAnim(MV_SHG_HITASS, 0, -1);
}
break;
Commit: 35c57ee8c2fbed7491832333deacbd43be709b44
https://github.com/scummvm/scummvm/commit/35c57ee8c2fbed7491832333deacbd43be709b44
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-13T10:21:02+02:00
Commit Message:
FULLPIPE: Fix red ball handling in scene29
Changed paths:
engines/fullpipe/scenes/scene29.cpp
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index aa1db83..6b68da0 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -131,7 +131,7 @@ void sceneHandler29_winArcade() {
ani = g_vars->scene29_flyingRedBalls.front();
g_vars->scene29_flyingRedBalls.remove_at(0);
- g_vars->scene29_greenBalls.push_back(ani);
+ g_vars->scene29_redBalls.push_back(ani);
ani->hide();
}
@@ -160,11 +160,11 @@ void sceneHandler29_shootGreen() {
}
void sceneHandler29_shootRed() {
- if (g_vars->scene29_greenBalls.size()) {
+ if (g_vars->scene29_redBalls.size()) {
int x = g_vars->scene29_shooter1->_ox - 101;
int y = g_vars->scene29_shooter1->_oy - 14;
- StaticANIObject *ani = g_vars->scene29_greenBalls.front();
- g_vars->scene29_greenBalls.remove_at(0);
+ StaticANIObject *ani = g_vars->scene29_redBalls.front();
+ g_vars->scene29_redBalls.remove_at(0);
ani->show1(x, y, MV_SHR_NORM, 0);
ani->_priority = 5;
@@ -362,7 +362,7 @@ void sceneHandler29_ballHitCheck() {
if (x >= 147) {
if (sceneHandler29_checkRedBallHit(ani, x)) {
- g_vars->scene29_greenBalls.push_back(ani);
+ g_vars->scene29_redBalls.push_back(ani);
g_vars->scene29_flyingRedBalls.remove_at(i);
@@ -377,7 +377,7 @@ void sceneHandler29_ballHitCheck() {
ani->setOXY(x, y);
}
} else {
- g_vars->scene29_greenBalls.push_back(ani);
+ g_vars->scene29_redBalls.push_back(ani);
ani->hide();
@@ -675,7 +675,7 @@ int sceneHandler29(ExCommand *cmd) {
break;
case MSG_SC29_SHOWLASTRED:
- if (g_vars->scene29_redBalls.size()) { // original uses scene29_greenBalls which looks like a copy/paste error
+ if (g_vars->scene29_redBalls.size()) { // original checks size of the scene29_greenBalls which looks like a copy/paste error
g_vars->scene29_redBalls.back()->show1(-1, -1, -1, 0);
g_vars->scene29_redBalls.back()->startAnim(MV_SHR_HITASS, 0, -1);
}
Commit: d059f3b7d661dc8d080880e85e408a75f273714e
https://github.com/scummvm/scummvm/commit/d059f3b7d661dc8d080880e85e408a75f273714e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-13T10:32:09+02:00
Commit Message:
FULLPIPE: Added more debug to scene29
Changed paths:
engines/fullpipe/scenes/scene29.cpp
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 6b68da0..f77af6f 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -389,6 +389,8 @@ void sceneHandler29_ballHitCheck() {
}
void sceneHandler29_manFromL() {
+ debugC(2, kDebugSceneLogic, "scene29: manFromL");
+
if (g_vars->scene29_manX < 497 && !g_vars->scene29_scrollingDisabled) {
getCurrSceneSc2MotionController()->activate();
getGameLoaderInteractionController()->enableFlag24();
@@ -403,6 +405,8 @@ void sceneHandler29_manFromL() {
}
void sceneHandler29_manFromR() {
+ debugC(2, kDebugSceneLogic, "scene29: manFromR");
+
getCurrSceneSc2MotionController()->activate();
getGameLoaderInteractionController()->enableFlag24();
@@ -424,6 +428,8 @@ int sceneHandler29_updateScreenCallback() {
}
void sceneHandler29_manToL() {
+ debugC(2, kDebugSceneLogic, "scene29: manToL");
+
getCurrSceneSc2MotionController()->deactivate();
getGameLoaderInteractionController()->disableFlag24();
@@ -440,6 +446,8 @@ void sceneHandler29_manToL() {
}
void sceneHandler29_manToR() {
+ debugC(2, kDebugSceneLogic, "scene29: manToR");
+
getCurrSceneSc2MotionController()->deactivate();
getGameLoaderInteractionController()->disableFlag24();
@@ -521,7 +529,9 @@ void sceneHandler29_shootersEscape() {
g_fp->_aniMan->setOXY(g_vars->scene29_manX, g_vars->scene29_manY);
if (g_vars->scene29_manX > 1310 && !g_vars->scene29_shooter1->_movement && !g_vars->scene29_shooter2->_movement
- && g_vars->scene29_shooter1->_statics->_staticsId == ST_STR1_RIGHT) {
+ && g_vars->scene29_shooter1->_statics->_staticsId == ST_STR1_RIGHT) {
+ debugC(2, kDebugSceneLogic, "scene29: shootersEscape");
+
g_vars->scene29_shootCountdown = 0;
g_vars->scene29_shooter1->changeStatics2(ST_STR1_STAND);
More information about the Scummvm-git-logs
mailing list