thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Added more debug output to scene09. Clarified pixel data type.

Browse source
This commit is contained in:
Eugene Sandulenko 2016-09-21 09:57:49 +02:00
parent 1810aaf313
commit 726b54d15c
5 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/fullpipe/scenes/scene06.cpp
View file

@ -475,7 +475,7 @@ void sceneHandler06_catchBall() {
} }
void sceneHandler06_checkBallTarget(int par) { void sceneHandler06_checkBallTarget(int par) {
int pixel; uint32 pixel;
if (g_vars->scene06_ballY <= 475) { if (g_vars->scene06_ballY <= 475) {
if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) { if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) {

3
engines/fullpipe/scenes/scene09.cpp
View file

@ -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); 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) { 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++) { 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) ? '-' : ' '); debugCN(2, kDebugSceneLogic, "%c", k == g_vars->scene09_hangerOffsets[j].x ? '@' : g_vars->scene09_hangers[i]->ani->isPixelHitAtPos(newx + k, ball->_oy + -15) ? '-' : ' ');
} }

2
engines/fullpipe/scenes/scene14.cpp
View file

@ -810,7 +810,7 @@ int sceneHandler14(ExCommand *cmd) {
case 29: case 29:
if (g_vars->scene14_arcadeIsOn) { 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) { if (g_vars->scene14_dudeCanKick && g_fp->_aniMan->getPixelAtPos(cmd->_sceneClickX, cmd->_sceneClickY, &pixel) && !g_fp->_aniMan->_movement) {
sceneHandler14_dudeDecline(); sceneHandler14_dudeDecline();

2
engines/fullpipe/statics.cpp
View file

@ -462,7 +462,7 @@ bool StaticANIObject::isPixelHitAtPos(int x, int y) {
return getPixelAtPos(x, y, 0, true); 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; bool res = false;
Picture *pic; Picture *pic;

2
engines/fullpipe/statics.h
View file

@ -257,7 +257,7 @@ public:
MessageQueue *changeStatics1(int msgNum); MessageQueue *changeStatics1(int msgNum);
void changeStatics2(int objId); 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); bool isPixelHitAtPos(int x, int y);
}; };