[Scummvm-cvs-logs] scummvm master -> c548b3cb548dfc14257bdb1f0e5f29686f599632
sev-
sev at scummvm.org
Mon Mar 10 22:19:57 CET 2014
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
503b582932 FULLPIPE: Implement sceneHandler18and19_girlJumpTo()
9a319a9dba FULLPIPE: Implement sceneHandler18and19_manStandArmchair()
e1b3130f43 FULLPIPE: Implement sceneHandler18and19_showBoyJump()
c548b3cb54 FULLPIPE: Implement sceneHandler18and19_showGirlJump()
Commit: 503b582932cd40aeb219dc81ee2c0aa5d810f281
https://github.com/scummvm/scummvm/commit/503b582932cd40aeb219dc81ee2c0aa5d810f281
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-10T23:19:16+02:00
Commit Message:
FULLPIPE: Implement sceneHandler18and19_girlJumpTo()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 64f528a..43807d7 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -888,6 +888,7 @@ namespace Fullpipe {
#define MSG_SC18_SHOWMANJUMP 1510
#define MSG_SC18_SHOWMANJUMPTO 1508
#define MV_BOY18_JUMPTO 1481
+#define MV_GRL18_JUMPTO 1488
#define MV_KSL_INBOY 1491
#define MV_KSL_INGIRL 1493
#define MV_KSL_INMAN 1504
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 9cecc3b..7c7a70b 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -452,7 +452,10 @@ void sceneHandler18and19_boyJumpTo() {
}
void sceneHandler18and19_girlJumpTo() {
- warning("STUB: sceneHandler18and19_girlJumpTo()");
+ g_vars->scene18_girl->stopAnim_maybe();
+ g_vars->scene18_girl->show1(g_vars->scene18_var05, g_vars->scene18_var06, MV_GRL18_JUMPTO, 0);
+ g_vars->scene18_girl->_priority = 50;
+ g_vars->scene18_girl->startAnim(MV_GRL18_JUMPTO, 0, -1);
}
void sceneHandler18and19_manStandArmchair() {
Commit: 9a319a9dbaf3ccff517f1d89b44b4b51ff1ae5f1
https://github.com/scummvm/scummvm/commit/9a319a9dbaf3ccff517f1d89b44b4b51ff1ae5f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-10T23:19:16+02:00
Commit Message:
FULLPIPE: Implement sceneHandler18and19_manStandArmchair()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 43807d7..e9712a1 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -899,6 +899,7 @@ namespace Fullpipe {
#define MV_KSL_SWINGBOY 1462
#define MV_KSL_SWINGGIRL 1464
#define MV_KSL_SWINGMAN 1502
+#define MV_MAN18_STANDKRESLO 1500
#define MV_WHR18_SPIN 1300
#define PIC_SC18_DOMIN 5184
#define PIC_SC18_LADDER1 1471
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 7c7a70b..1b2c3c5 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -459,7 +459,10 @@ void sceneHandler18and19_girlJumpTo() {
}
void sceneHandler18and19_manStandArmchair() {
- warning("STUB: sceneHandler18and19_manStandArmchair()");
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
+ g_fp->_aniMan->_flags |= 1;
+ g_fp->_aniMan->_priority = 35;
+ g_fp->_aniMan->startAnim(MV_MAN18_STANDKRESLO, 0, -1);
}
void sceneHandler18and19_drawRiders() {
Commit: e1b3130f439ecb8e296df6da3ce4fcecf4633398
https://github.com/scummvm/scummvm/commit/e1b3130f439ecb8e296df6da3ce4fcecf4633398
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-10T23:19:16+02:00
Commit Message:
FULLPIPE: Implement sceneHandler18and19_showBoyJump()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index e9712a1..dae6b30 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -887,8 +887,10 @@ namespace Fullpipe {
#define MSG_SC18_SHOWGIRLJUMPTO 1499
#define MSG_SC18_SHOWMANJUMP 1510
#define MSG_SC18_SHOWMANJUMPTO 1508
+#define MV_BOY18_JUMPFROM 1478
#define MV_BOY18_JUMPTO 1481
#define MV_GRL18_JUMPTO 1488
+#define MV_KSL_CALMDOWN 1476
#define MV_KSL_INBOY 1491
#define MV_KSL_INGIRL 1493
#define MV_KSL_INMAN 1504
@@ -914,6 +916,7 @@ namespace Fullpipe {
#define ST_KSL_JUMPGIRL 1494
#define ST_KSL_JUMPMAN 1505
#define ST_KSL_MAN 1503
+#define ST_KSL_REACT 1474
// Scene 19
#define ANI_CORDIE 1529
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 1b2c3c5..5e5d128 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -441,7 +441,27 @@ void sceneHandler18and19_showBoyJumpTo() {
}
void sceneHandler18and19_showBoyJump() {
- warning("STUB: sceneHandler18and19_showBoyJump()");
+ StaticANIObject *ani = g_vars->scene18_var07[g_vars->scene18_var32]->ani;
+ int x, y;
+
+ if (ani->_movement) {
+ x = ani->_movement->_ox;
+ y = ani->_movement->_oy;
+ } else {
+ x = ani->_ox;
+ y = ani->_oy;
+ }
+
+ g_vars->scene18_boy->show1(x - 48, y + 8, MV_BOY18_JUMPFROM, 0);
+ g_vars->scene18_boy->_priority = 50;
+ g_vars->scene18_boy->startAnim(MV_BOY18_JUMPFROM, 0, -1);
+
+ g_vars->scene18_var07[g_vars->scene18_var32]->sflags = 1;
+
+ g_vars->scene18_var07[g_vars->scene18_var32]->ani->changeStatics2(ST_KSL_REACT);
+ g_vars->scene18_var07[g_vars->scene18_var32]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
+
+ g_vars->scene18_var26 = 1;
}
void sceneHandler18and19_boyJumpTo() {
Commit: c548b3cb548dfc14257bdb1f0e5f29686f599632
https://github.com/scummvm/scummvm/commit/c548b3cb548dfc14257bdb1f0e5f29686f599632
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-10T23:19:17+02:00
Commit Message:
FULLPIPE: Implement sceneHandler18and19_showGirlJump()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index dae6b30..62f344e 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -889,6 +889,7 @@ namespace Fullpipe {
#define MSG_SC18_SHOWMANJUMPTO 1508
#define MV_BOY18_JUMPFROM 1478
#define MV_BOY18_JUMPTO 1481
+#define MV_GRL18_JUMPFROM 1485
#define MV_GRL18_JUMPTO 1488
#define MV_KSL_CALMDOWN 1476
#define MV_KSL_INBOY 1491
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 5e5d128..431470b 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -425,7 +425,28 @@ void sceneHandler18and19_showGirlJumpTo() {
}
void sceneHandler18and19_showGirlJump() {
- warning("STUB: sceneHandler18and19_showGirlJump()");
+ StaticANIObject *ani = g_vars->scene18_var07[g_vars->scene18_var32]->ani;
+ int x, y;
+
+ if (ani->_movement) {
+ x = ani->_movement->_ox;
+ y = ani->_movement->_oy;
+ } else {
+ x = ani->_ox;
+ y = ani->_oy;
+ }
+
+ g_vars->scene18_girl->show1(x - 62, y - 10, MV_GRL18_JUMPFROM, 0);
+ g_vars->scene18_girl->_priority = 50;
+ g_vars->scene18_girl->startAnim(MV_GRL18_JUMPFROM, 0, -1);
+
+ g_vars->scene18_var07[g_vars->scene18_var32]->sflags = 1;
+
+ g_vars->scene18_var07[g_vars->scene18_var32]->ani->changeStatics2(ST_KSL_REACT);
+ g_vars->scene18_var07[g_vars->scene18_var32]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
+
+ g_vars->scene18_var23 = 1;
+ g_vars->scene18_var25++;
}
void sceneHandler18and19_showBoyJumpTo() {
More information about the Scummvm-git-logs
mailing list