aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/fullpipe/gfx.cpp2
-rw-r--r--engines/fullpipe/messages.cpp1
-rw-r--r--engines/fullpipe/scene.cpp2
-rw-r--r--engines/fullpipe/statics.cpp17
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 3f32c27615..e368c4b262 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -506,7 +506,7 @@ void Picture::draw(int x, int y, int style, int angle) {
return;
if ((_alpha & 0xff) < 0xff) {
- warning("Picture:draw: alpha = %0x", _alpha);
+ debug(0, "Picture:draw: alpha = %0x", _alpha);
}
byte *pal = _paletteData;
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index cc7cd2e942..dcf9a222f8 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -644,7 +644,6 @@ void clearMessageHandlers() {
}
void processMessages() {
- warning("###################### processing");
if (!g_fullpipe->_isProcessingMessages) {
g_fullpipe->_isProcessingMessages = true;
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 47a68118df..891b34f196 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -469,7 +469,7 @@ void Scene::draw() {
}
void Scene::updateScrolling() {
- warning("STUB Scene::updateScrolling()");
+ debug(0, "STUB Scene::updateScrolling()");
}
void Scene::updateScrolling2() {
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 7e4c1397ac..ad51b8fa4c 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -907,26 +907,24 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase
if (_flags & 0x80)
return false;
- warning("STUB: StaticANIObject::startAnim(%d, %d, %d)", movementId, messageQueueId, dynPhaseIdx);
+ debug(0, "StaticANIObject::startAnim(%d, %d, %d)", movementId, messageQueueId, dynPhaseIdx);
if (_messageQueueId) {
updateGlobalMessageQueue(messageQueueId, _id);
return false;
}
- bool found = false;
- Movement *mov;
+ Movement *mov = 0;
for (uint i = 0; i < _movements.size(); i++) {
- mov = (Movement *)_movements[i];
- if (mov->_id != movementId) {
- found = true;
+ if (((Movement *)_movements[i])->_id == movementId) {
+ mov = (Movement *)_movements[i];
break;
}
}
- if (!found) {
+ if (!mov) {
updateGlobalMessageQueue(messageQueueId, _id);
return false;
}
@@ -935,7 +933,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase
_flags |= 1;
_messageQueueId = messageQueueId;
- return 1;
+ return true;
}
int newx = _ox;
@@ -944,6 +942,9 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase
if (_movement) {
_movement->getCurrDynamicPhaseXY(point);
+
+ newx -= point.x;
+ newy -= point.y;
} else if (_statics) {
_statics->getSomeXY(point);