[Scummvm-git-logs] scummvm master -> 5a76ae7ceb61307adb987da10b3df3973ff07594
sev-
sev at scummvm.org
Sun Oct 2 15:14:31 CEST 2016
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4acb6c886c FULLPIPE: Center mouse cursor on startup
4ddf68ac9a FULLPIPE: Fix ball collision detection in scene14
405c4e0415 FULLPIPE: Improve collision detection in scene06
c141baeb61 FULLPIPE: Fix code formatting
5a76ae7ceb FULLPIPE: Fix Grandma positioning in scene14
Commit: 4acb6c886cacf5aa08d828508472c8ff7aa8947a
https://github.com/scummvm/scummvm/commit/4acb6c886cacf5aa08d828508472c8ff7aa8947a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T13:23:04+02:00
Commit Message:
FULLPIPE: Center mouse cursor on startup
Changed paths:
engines/fullpipe/fullpipe.cpp
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index e9694a0..39b4243 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -307,6 +307,9 @@ Common::Error FullpipeEngine::run() {
int time1 = g_fp->_system->getMillis();
+ // Center mouse
+ _system->warpMouse(400, 300);
+
while (_gameContinue) {
updateEvents();
Commit: 4ddf68ac9a58f528a5caf3f3ff3cbfd255f4e4dd
https://github.com/scummvm/scummvm/commit/4ddf68ac9a58f528a5caf3f3ff3cbfd255f4e4dd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T13:44:37+02:00
Commit Message:
FULLPIPE: Fix ball collision detection in scene14
Changed paths:
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 8fd95b7..d5c0d45 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -807,9 +807,7 @@ int sceneHandler14(ExCommand *cmd) {
case 29:
if (g_vars->scene14_arcadeIsOn) {
- uint32 pixel;
-
- if (g_vars->scene14_dudeCanKick && g_fp->_aniMan->getPixelAtPos(cmd->_sceneClickX, cmd->_sceneClickY, &pixel) && !g_fp->_aniMan->_movement) {
+ if (g_vars->scene14_dudeCanKick && g_fp->_aniMan->isPixelHitAtPos(cmd->_sceneClickX, cmd->_sceneClickY) && !g_fp->_aniMan->_movement) {
sceneHandler14_dudeDecline();
break;
}
Commit: 405c4e04157cdaa5ddeb75d29c4547682925f580
https://github.com/scummvm/scummvm/commit/405c4e04157cdaa5ddeb75d29c4547682925f580
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T13:44:57+02:00
Commit Message:
FULLPIPE: Improve collision detection in scene06
Changed paths:
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 9b483a0..5fab4b5 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -474,15 +474,11 @@ void sceneHandler06_catchBall() {
}
void sceneHandler06_checkBallTarget(int par) {
- uint32 pixel;
-
if (g_vars->scene06_ballY <= 475) {
- if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) {
- if (pixel) {
- chainObjQueue(g_vars->scene06_mumsy, QU_MOM_JUMPBK, 0);
+ if (g_vars->scene06_mumsy->isPixelHitAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY)) {
+ chainObjQueue(g_vars->scene06_mumsy, QU_MOM_JUMPBK, 0);
- sceneHandler06_catchBall();
- }
+ sceneHandler06_catchBall();
}
} else {
sceneHandler06_fallBall();
Commit: c141baeb613e8b4a351d73a776d220170d27c38a
https://github.com/scummvm/scummvm/commit/c141baeb613e8b4a351d73a776d220170d27c38a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T15:11:52+02:00
Commit Message:
FULLPIPE: Fix code formatting
Changed paths:
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index d5c0d45..aea7464 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -306,7 +306,7 @@ void sceneHandler14_endArcade() {
void sceneHandler14_winArcade() {
if (g_vars->scene14_arcadeIsOn) {
if (g_vars->scene14_dudeIsKicking) {
- g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
g_vars->scene14_dudeIsKicking = false;
}
@@ -424,7 +424,7 @@ void sceneHandler14_dudeDecline() {
g_vars->scene14_mouseCursorPos.y = g_fp->_mouseVirtY;
g_fp->_aniMan->_callback2 = sceneHandler14_declineCallback;
- g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
g_fp->_aniMan->startAnim(MV_MAN14_DECLINE, 0, -1);
g_vars->scene14_dudeIsKicking = true;
@@ -547,7 +547,7 @@ void sceneHandler14_dudeFall() {
if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id != MV_MAN14_FALL) {
sceneHandler14_clearCallback();
- g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
g_fp->_aniMan->startAnim(MV_MAN14_FALL, 0, -1);
g_vars->scene14_flyingBall->stopAnim_maybe();
g_vars->scene14_flyingBall->hide();
@@ -558,7 +558,7 @@ void sceneHandler14_dudeFall() {
}
void sceneHandler14_grandmaStepForward() {
- g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
g_fp->_aniMan->startAnim(MV_MAN14_STEPFW, 0, -1);
g_vars->scene14_dude2X -= 71;
@@ -622,14 +622,18 @@ void sceneHandler14_arcadeLogic() {
}
void sceneHandler14_animateBall() {
- int x = g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
- int y = g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
+ g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
+ g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
+
+ int x = g_vars->scene14_ballX;
+ int y = g_vars->scene14_ballY;
g_vars->scene14_ballDeltaY++;
if (g_vars->scene14_ballY <= 517) {
- if (x <= g_vars->scene14_dudeX - 16 ) {
- if ( g_vars->scene14_ballDeltaX >= 0 || x >= g_vars->scene14_grandmaX + 65 || x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102 ) {
+ if (x <= g_vars->scene14_dudeX - 16) {
+ if (g_vars->scene14_ballDeltaX >= 0 || x >= g_vars->scene14_grandmaX + 65
+ || x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102) {
if (g_vars->scene14_flyingBall->_movement)
g_vars->scene14_flyingBall->_movement->setOXY(x, y);
else
@@ -827,7 +831,7 @@ int sceneHandler14(ExCommand *cmd) {
if (!pic || !canInteractAny(g_fp->_aniMan, pic, cmd->_param)) {
if ((g_fp->_sceneRect.right - cmd->_sceneClickX < 47 && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1)
- || (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) {
+ || (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) {
g_fp->processArcade(cmd);
sceneHandler14_arcadeProcessClick(cmd);
break;
Commit: 5a76ae7ceb61307adb987da10b3df3973ff07594
https://github.com/scummvm/scummvm/commit/5a76ae7ceb61307adb987da10b3df3973ff07594
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T15:14:05+02:00
Commit Message:
FULLPIPE: Fix Grandma positioning in scene14
Changed paths:
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index aea7464..977f3d9 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -481,7 +481,7 @@ bool sceneHandler14_arcadeProcessClick(ExCommand *cmd) {
void sceneHandler14_grandmaThrow() {
g_vars->scene14_grandma->changeStatics2(ST_GMA_SIT);
- MessageQueue *mq = new MessageQueue;
+ MessageQueue *mq = new MessageQueue(0);
ExCommand *ex = new ExCommand(ANI_GRANDMA, 2, 30, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags |= 2;
@@ -521,7 +521,7 @@ void sceneHandler14_passToGrandma() {
void sceneHandler14_grandmaJumpThrow() {
g_vars->scene14_grandma->changeStatics2(ST_GMA_SIT);
- MessageQueue *mq = new MessageQueue;
+ MessageQueue *mq = new MessageQueue(0);
ExCommand *ex = new ExCommand(ANI_GRANDMA, 2, 30, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags |= 2;
More information about the Scummvm-git-logs
mailing list