[Scummvm-cvs-logs] scummvm master -> b5cd8e69a0a38389d85d324a6e11902a10595edc
sev-
sev at scummvm.org
Mon Apr 7 22:44:35 CEST 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:
8f5b068474 FULLPIPE: More work on renaming in scene29
b5cd8e69a0 FULLPIPE: Renames in scene29
Commit: 8f5b068474eca6a704ebef3ab254f7e974c92730
https://github.com/scummvm/scummvm/commit/8f5b068474eca6a704ebef3ab254f7e974c92730
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-07T23:43:47+03:00
Commit Message:
FULLPIPE: More work on renaming in scene29
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene29.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index a75d521..ed8d100 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -384,10 +384,10 @@ Vars::Vars() {
scene29_ass = 0;
scene29_manIsRiding = false;
scene29_var10 = false;
- scene29_var11 = 0;
- scene29_var12 = 0;
+ scene29_reachedFarRight = false;
+ scene29_rideBackEnabled = false;
scene29_var13 = 0;
- scene29_var14 = 75;
+ scene29_shootDistance = 75;
scene29_var15 = 0;
scene29_var16 = 0;
scene29_var17 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 33a3eb4..0becfcc 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -601,10 +601,10 @@ public:
BallChain scene29_greenBalls;
bool scene29_manIsRiding;
bool scene29_var10;
- int scene29_var11;
- int scene29_var12;
+ bool scene29_reachedFarRight;
+ bool scene29_rideBackEnabled;
int scene29_var13;
- int scene29_var14;
+ int scene29_shootDistance;
int scene29_var15;
int scene29_var16;
int scene29_var17;
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 01824e0..c3cd161 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -155,10 +155,10 @@ void scene29_initScene(Scene *sc) {
g_vars->scene29_manIsRiding = false;
g_vars->scene29_var10 = false;
- g_vars->scene29_var11 = 0;
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_reachedFarRight = false;
+ g_vars->scene29_rideBackEnabled = false;
g_vars->scene29_var13 = 0;
- g_vars->scene29_var14 = 75;
+ g_vars->scene29_shootDistance = 75;
g_vars->scene29_var15 = 0;
g_vars->scene29_var16 = 0;
g_vars->scene29_var17 = 0;
@@ -406,9 +406,9 @@ void sceneHandler29_shootRed() {
void sceneHandler29_manJump() {
if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id == MV_MAN29_RUN || g_fp->_aniMan->_movement->_id == MV_MAN29_STANDUP) {
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_rideBackEnabled = false;
g_vars->scene29_var15 = 0;
- g_vars->scene29_var11 = 1;
+ g_vars->scene29_reachedFarRight = true;
g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
g_fp->_aniMan->startAnim(MV_MAN29_JUMP, 0, -1);
@@ -420,9 +420,9 @@ void sceneHandler29_manJump() {
void sceneHandler29_manBend() {
if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id == MV_MAN29_RUN || g_fp->_aniMan->_movement->_id == MV_MAN29_STANDUP) {
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_rideBackEnabled = false;
g_vars->scene29_var15 = 0;
- g_vars->scene29_var11 = 1;
+ g_vars->scene29_reachedFarRight = true;
g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
g_fp->_aniMan->startAnim(MV_MAN29_BEND, 0, -1);
@@ -519,8 +519,8 @@ void sceneHandler29_manHit() {
g_vars->scene29_manIsRiding = false;
g_vars->scene29_var10 = false;
- g_vars->scene29_var11 = 0;
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_reachedFarRight = false;
+ g_vars->scene29_rideBackEnabled = false;
} else {
ex = new ExCommand(ANI_MAN, 1, MV_MAN29_STANDUP, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags = 2;
@@ -706,7 +706,7 @@ void sceneHandler29_manFromR() {
chainQueue(QU_SC29_MANFROM_R, 1);
g_vars->scene29_var10 = false;
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_rideBackEnabled = false;
}
int sceneHandler29_updateScreenCallback() {
@@ -800,7 +800,7 @@ void sceneHandler29_sub05() {
if (g_vars->scene29_var20 > 1436) {
sceneHandler29_manFromR();
} else {
- g_vars->scene29_var14 = (1310 - g_vars->scene29_var20) * 5213 / 100000 + 25;
+ g_vars->scene29_shootDistance = (1310 - g_vars->scene29_var20) * 5213 / 100000 + 25;
if (!g_vars->scene29_var15)
g_fp->_aniMan->startAnim(MV_MAN29_RUN, 0, -1);
@@ -838,7 +838,7 @@ void sceneHandler29_shootersEscape() {
}
}
-void sceneHandler29_sub07() {
+void sceneHandler29_manRideBack() {
g_vars->scene29_var20 -= 2;
g_fp->_aniMan->setOXY(g_vars->scene29_var20, g_vars->scene29_var21);
@@ -998,29 +998,29 @@ int sceneHandler29(ExCommand *cmd) {
case MSG_SC29_STOPRIDE:
g_vars->scene29_manIsRiding = false;
g_vars->scene29_var10 = false;
- g_vars->scene29_var11 = 0;
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_reachedFarRight = false;
+ g_vars->scene29_rideBackEnabled = false;
getCurrSceneSc2MotionController()->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
break;
case MSG_SC29_DISABLERIDEBACK:
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_rideBackEnabled = false;
break;
case MSG_SC29_ENABLERIDEBACK:
- g_vars->scene29_var12 = 1;
- g_vars->scene29_var11 = 0;
+ g_vars->scene29_rideBackEnabled = true;
+ g_vars->scene29_reachedFarRight = false;
break;
case MSG_SC29_DISABLEPORTER:
- g_vars->scene29_var11 = 0;
+ g_vars->scene29_reachedFarRight = false;
break;
case MSG_SC29_ENABLEPORTER:
- g_vars->scene29_var11 = 1;
- g_vars->scene29_var12 = 0;
+ g_vars->scene29_reachedFarRight = true;
+ g_vars->scene29_rideBackEnabled = false;
g_vars->scene29_var15 = 0;
break;
@@ -1082,14 +1082,14 @@ int sceneHandler29(ExCommand *cmd) {
else if (g_vars->scene29_var10 && !g_fp->_aniMan->_movement)
sceneHandler29_sub05();
- if (g_vars->scene29_var11)
+ if (g_vars->scene29_reachedFarRight)
sceneHandler29_shootersEscape();
- else if (g_vars->scene29_var12)
- sceneHandler29_sub07();
+ else if (g_vars->scene29_rideBackEnabled)
+ sceneHandler29_manRideBack();
g_vars->scene29_var13++;
- if (g_vars->scene29_var13 > g_vars->scene29_var14)
+ if (g_vars->scene29_var13 > g_vars->scene29_shootDistance)
sceneHandler29_shoot();
sceneHandler29_animBearded();
Commit: b5cd8e69a0a38389d85d324a6e11902a10595edc
https://github.com/scummvm/scummvm/commit/b5cd8e69a0a38389d85d324a6e11902a10595edc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-07T23:43:47+03:00
Commit Message:
FULLPIPE: Renames in scene29
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene29.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index ed8d100..9615759 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -386,11 +386,11 @@ Vars::Vars() {
scene29_var10 = false;
scene29_reachedFarRight = false;
scene29_rideBackEnabled = false;
- scene29_var13 = 0;
+ scene29_shootCountdown = 0;
scene29_shootDistance = 75;
- scene29_var15 = 0;
- scene29_var16 = 0;
- scene29_var17 = 0;
+ scene29_manIsHit = 0;
+ scene29_scrollSpeed = 0;
+ scene29_scrollingDisabled = 0;
scene29_var18 = 0;
scene29_var20 = 0;
scene29_var21 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0becfcc..13e18f7 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -603,11 +603,11 @@ public:
bool scene29_var10;
bool scene29_reachedFarRight;
bool scene29_rideBackEnabled;
- int scene29_var13;
+ int scene29_shootCountdown;
int scene29_shootDistance;
- int scene29_var15;
- int scene29_var16;
- int scene29_var17;
+ int scene29_manIsHit;
+ int scene29_scrollSpeed;
+ bool scene29_scrollingDisabled;
int scene29_var18;
Common::Array<WalkingBearder *> scene29_var19;
int scene29_var20;
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index c3cd161..c03929a 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -157,11 +157,11 @@ void scene29_initScene(Scene *sc) {
g_vars->scene29_var10 = false;
g_vars->scene29_reachedFarRight = false;
g_vars->scene29_rideBackEnabled = false;
- g_vars->scene29_var13 = 0;
+ g_vars->scene29_shootCountdown = 0;
g_vars->scene29_shootDistance = 75;
- g_vars->scene29_var15 = 0;
- g_vars->scene29_var16 = 0;
- g_vars->scene29_var17 = 0;
+ g_vars->scene29_manIsHit = false;
+ g_vars->scene29_scrollSpeed = 0;
+ g_vars->scene29_scrollingDisabled = false;
g_vars->scene29_var18 = 0;
g_fp->setArcadeOverlay(PIC_CSR_ARCADE8);
@@ -169,7 +169,7 @@ void scene29_initScene(Scene *sc) {
void sceneHandler29_winArcade() {
if (g_vars->scene29_shooter2->_flags & 4) {
- g_vars->scene29_var13 = 0;
+ g_vars->scene29_shootCountdown = 0;
g_vars->scene29_shooter1->changeStatics2(ST_STR1_STAND);
g_vars->scene29_shooter2->changeStatics2(ST_STR2_STAND);
@@ -407,7 +407,7 @@ void sceneHandler29_shootRed() {
void sceneHandler29_manJump() {
if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id == MV_MAN29_RUN || g_fp->_aniMan->_movement->_id == MV_MAN29_STANDUP) {
g_vars->scene29_rideBackEnabled = false;
- g_vars->scene29_var15 = 0;
+ g_vars->scene29_manIsHit = false;
g_vars->scene29_reachedFarRight = true;
g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
@@ -421,7 +421,7 @@ void sceneHandler29_manJump() {
void sceneHandler29_manBend() {
if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id == MV_MAN29_RUN || g_fp->_aniMan->_movement->_id == MV_MAN29_STANDUP) {
g_vars->scene29_rideBackEnabled = false;
- g_vars->scene29_var15 = 0;
+ g_vars->scene29_manIsHit = false;
g_vars->scene29_reachedFarRight = true;
g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
@@ -433,7 +433,7 @@ void sceneHandler29_manBend() {
}
bool sceneHandler29_sub15(StaticANIObject *ani, int maxx) {
- if (!g_vars->scene29_var10 || g_vars->scene29_var15)
+ if (!g_vars->scene29_var10 || g_vars->scene29_manIsHit)
return false;
if ((ani->_ox >= g_vars->scene29_var20 + 42 || ani->_ox <= g_vars->scene29_var20 + 8)
@@ -453,7 +453,7 @@ bool sceneHandler29_sub15(StaticANIObject *ani, int maxx) {
}
bool sceneHandler29_sub16(StaticANIObject *ani, int maxx) {
- if (!g_vars->scene29_var10 || g_vars->scene29_var15)
+ if (!g_vars->scene29_var10 || g_vars->scene29_manIsHit)
return false;
if (ani->_ox >= g_vars->scene29_var20 + 40) {
@@ -489,7 +489,7 @@ bool sceneHandler29_sub16(StaticANIObject *ani, int maxx) {
void sceneHandler29_manHit() {
MGMInfo mgminfo;
- g_vars->scene29_var15 = 1;
+ g_vars->scene29_manIsHit = true;
g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
g_fp->_aniMan->setOXY(g_vars->scene29_var20, g_vars->scene29_var21);
@@ -686,16 +686,16 @@ void sceneHandler29_sub03() {
}
void sceneHandler29_manFromL() {
- if (g_vars->scene29_var20 < 497 && !g_vars->scene29_var17) {
+ if (g_vars->scene29_var20 < 497 && !g_vars->scene29_scrollingDisabled) {
getCurrSceneSc2MotionController()->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
chainQueue(QU_SC29_MANFROM_L, 1);
- g_vars->scene29_var17 = 1;
+ g_vars->scene29_scrollingDisabled = true;
- g_fp->_scrollSpeed = g_vars->scene29_var16;
+ g_fp->_scrollSpeed = g_vars->scene29_scrollSpeed;
}
}
@@ -746,9 +746,9 @@ void sceneHandler29_manToR() {
g_fp->_msgY = -1;
g_fp->_msgX = -1;
- g_vars->scene29_var17 = 0;
+ g_vars->scene29_scrollingDisabled = false;
- g_vars->scene29_var16 = g_fp->_scrollSpeed;
+ g_vars->scene29_scrollSpeed = g_fp->_scrollSpeed;
g_fp->_scrollSpeed = 4;
}
@@ -802,7 +802,7 @@ void sceneHandler29_sub05() {
} else {
g_vars->scene29_shootDistance = (1310 - g_vars->scene29_var20) * 5213 / 100000 + 25;
- if (!g_vars->scene29_var15)
+ if (!g_vars->scene29_manIsHit)
g_fp->_aniMan->startAnim(MV_MAN29_RUN, 0, -1);
}
}
@@ -819,7 +819,7 @@ void sceneHandler29_shootersEscape() {
if (g_vars->scene29_var20 > 1310 && !g_vars->scene29_shooter1->_movement && !g_vars->scene29_shooter2->_movement
&& g_vars->scene29_shooter1->_statics->_staticsId == ST_STR1_RIGHT) {
- g_vars->scene29_var13 = 0;
+ g_vars->scene29_shootCountdown = 0;
g_vars->scene29_shooter1->changeStatics2(ST_STR1_STAND);
g_vars->scene29_shooter2->changeStatics2(ST_STR2_STAND);
@@ -851,13 +851,13 @@ void sceneHandler29_shoot() {
if (g_vars->scene29_shooter2->_flags & 4) {
g_vars->scene29_shooter2->startAnim(MV_STR2_SHOOT, 0, -1);
- g_vars->scene29_var13 = 0;
+ g_vars->scene29_shootCountdown = 0;
}
}
} else {
g_vars->scene29_shooter1->startAnim(MV_STR1_SHOOT, 0, -1);
- g_vars->scene29_var13 = 0;
+ g_vars->scene29_shootCountdown = 0;
}
}
}
@@ -1021,7 +1021,7 @@ int sceneHandler29(ExCommand *cmd) {
case MSG_SC29_ENABLEPORTER:
g_vars->scene29_reachedFarRight = true;
g_vars->scene29_rideBackEnabled = false;
- g_vars->scene29_var15 = 0;
+ g_vars->scene29_manIsHit = false;
break;
case 29:
@@ -1087,9 +1087,9 @@ int sceneHandler29(ExCommand *cmd) {
else if (g_vars->scene29_rideBackEnabled)
sceneHandler29_manRideBack();
- g_vars->scene29_var13++;
+ g_vars->scene29_shootCountdown++;
- if (g_vars->scene29_var13 > g_vars->scene29_shootDistance)
+ if (g_vars->scene29_shootCountdown > g_vars->scene29_shootDistance)
sceneHandler29_shoot();
sceneHandler29_animBearded();
More information about the Scummvm-git-logs
mailing list