aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2016-09-21 09:57:49 +0200
committerEugene Sandulenko2016-09-21 21:22:22 +0200
commit726b54d15c91c53193064117a82df33e7c32e78d (patch)
tree3d7ff99d652bfae99c4e9ff52fa237eddb119f89 /engines
parent1810aaf3137c0da45fe515211583031e7c2e9b76 (diff)
downloadscummvm-rg350-726b54d15c91c53193064117a82df33e7c32e78d.tar.gz
scummvm-rg350-726b54d15c91c53193064117a82df33e7c32e78d.tar.bz2
scummvm-rg350-726b54d15c91c53193064117a82df33e7c32e78d.zip
FULLPIPE: Added more debug output to scene09. Clarified pixel data type.
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/scenes/scene06.cpp2
-rw-r--r--engines/fullpipe/scenes/scene09.cpp3
-rw-r--r--engines/fullpipe/scenes/scene14.cpp2
-rw-r--r--engines/fullpipe/statics.cpp2
-rw-r--r--engines/fullpipe/statics.h2
5 files changed, 7 insertions, 4 deletions
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 4d1b263fd4..cfdc23cb44 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -475,7 +475,7 @@ void sceneHandler06_catchBall() {
}
void sceneHandler06_checkBallTarget(int par) {
- int pixel;
+ uint32 pixel;
if (g_vars->scene06_ballY <= 475) {
if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) {
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index cb90061019..a50cd3a163 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -379,6 +379,9 @@ void sceneHandler09_checkHangerCollide() {
hit = g_vars->scene09_hangers[i]->ani->isPixelHitAtPos(newx + g_vars->scene09_hangerOffsets[j].x, ball->_oy + g_vars->scene09_hangerOffsets[j].y);
if (hit) {
+ uint32 pixel;
+ g_vars->scene09_hangers[i]->ani->getPixelAtPos(newx + g_vars->scene09_hangerOffsets[j].x, ball->_oy + g_vars->scene09_hangerOffsets[j].y, &pixel);
+ debugC(2, kDebugSceneLogic, "%x", pixel);
for (int k = 0; k < 20; k++) {
debugCN(2, kDebugSceneLogic, "%c", k == g_vars->scene09_hangerOffsets[j].x ? '@' : g_vars->scene09_hangers[i]->ani->isPixelHitAtPos(newx + k, ball->_oy + -15) ? '-' : ' ');
}
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 0e072094d7..f6841a8bbe 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -810,7 +810,7 @@ int sceneHandler14(ExCommand *cmd) {
case 29:
if (g_vars->scene14_arcadeIsOn) {
- int pixel;
+ uint32 pixel;
if (g_vars->scene14_dudeCanKick && g_fp->_aniMan->getPixelAtPos(cmd->_sceneClickX, cmd->_sceneClickY, &pixel) && !g_fp->_aniMan->_movement) {
sceneHandler14_dudeDecline();
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index d976e2ff59..79432d440a 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -462,7 +462,7 @@ bool StaticANIObject::isPixelHitAtPos(int x, int y) {
return getPixelAtPos(x, y, 0, true);
}
-bool StaticANIObject::getPixelAtPos(int x, int y, int *pixel, bool hitOnly) {
+bool StaticANIObject::getPixelAtPos(int x, int y, uint32 *pixel, bool hitOnly) {
bool res = false;
Picture *pic;
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 6206fef4de..9c7cab5448 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -257,7 +257,7 @@ public:
MessageQueue *changeStatics1(int msgNum);
void changeStatics2(int objId);
- bool getPixelAtPos(int x, int y, int *pixel, bool hitOnly = false);
+ bool getPixelAtPos(int x, int y, uint32 *pixel, bool hitOnly = false);
bool isPixelHitAtPos(int x, int y);
};