libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-04 16:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Rename vars in scene30

Browse Source
This commit is contained in:
Eugene Sandulenko 2014-01-02 14:02:21 +02:00
parent 64b001e869
commit 8deb6908e2
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/fullpipe/scenes.cpp
View File

@ -261,12 +261,8 @@ Vars::Vars() {
scene24_jet = 0;
scene24_drop = 0;
scene30_var01 = 0;
scene30_var02 = 0;
scene30_var03 = 0;
scene30_var04 = 0;
scene30_leg = 0;
scene30_var05 = 0;
scene30_liftFlag = 1;
scene31_chantingCountdown = 0;
scene31_cactus = 0;

6
engines/fullpipe/scenes.h
View File

@ -354,12 +354,8 @@ public:
StaticANIObject *scene24_jet;
StaticANIObject *scene24_drop;
int scene30_var01;
int scene30_var02;
int scene30_var03;
int scene30_var04;
StaticANIObject *scene30_leg;
int scene30_var05;
int scene30_liftFlag;
int scene31_chantingCountdown;
StaticANIObject *scene31_cactus;

17
engines/fullpipe/scenes/scene30.cpp
View File

@ -46,11 +46,6 @@ void scene30_enablePass(Scene *sc) {
}
void scene30_initScene(Scene *sc, int flag) {
g_vars->scene30_var01 = 200;
g_vars->scene30_var02 = 200;
g_vars->scene30_var03 = 300;
g_vars->scene30_var04 = 300;
Scene *oldsc = g_fp->_currentScene;
g_vars->scene30_leg = sc->getStaticANIObject1ById(ANI_LEG, -1);
@ -72,9 +67,9 @@ void scene30_initScene(Scene *sc, int flag) {
scene30_enablePass(sc);
if (flag == LiftUp || flag == LiftDown)
g_vars->scene30_var05 = 0;
g_vars->scene30_liftFlag = 0;
else
g_vars->scene30_var05 = 1;
g_vars->scene30_liftFlag = 1;
g_fp->lift_setButton(sO_Level8, ST_LBN_8N);
@ -139,11 +134,11 @@ int sceneHandler30(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
if (x < g_fp->_sceneRect.left + g_vars->scene30_var01)
g_fp->_currentScene->_x = x - g_vars->scene30_var03 - g_fp->_sceneRect.left;
if (x < g_fp->_sceneRect.left + 200)
g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
if (x > g_fp->_sceneRect.right - g_vars->scene30_var01)
g_fp->_currentScene->_x = x + g_vars->scene30_var03 - g_fp->_sceneRect.right;
if (x > g_fp->_sceneRect.right - 200)
g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
g_fp->_behaviorManager->updateBehaviors();