diff options
Diffstat (limited to 'engines/fullpipe/statics.cpp')
| -rw-r--r-- | engines/fullpipe/statics.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 0539edd047..79432d440a 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -191,9 +191,9 @@ StaticANIObject::StaticANIObject(StaticANIObject *src) : GameObject(src) { Movement *newmov; if (src->_movements[i]->_currMovement) { - // WORKAROUND: Original uses weird construction here: - // new Movement(getMovementById(src->getMovementIdById(mov->_id)), this); - newmov = new Movement(src->getMovementById(src->getMovementIdById(src->_movements[i]->_id)), this); + // This is weird code. Logically it should be + // newmov = new Movement(src->getMovementById(src->getMovementIdById(src->_movements[i]->_id)), this); + newmov = new Movement(getMovementById(src->getMovementIdById(src->_movements[i]->_id)), this); newmov->_id = src->_movements[i]->_id; } else { newmov = new Movement(src->_movements[i], 0, -1, this); @@ -440,7 +440,7 @@ int StaticANIObject::getMovementIdById(int itemId) { if (mov->_currMovement) { if (mov->_id == itemId) - return mov->_id; + return mov->_currMovement->_id; if (mov->_currMovement->_id == itemId) return mov->_id; @@ -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; @@ -538,11 +538,6 @@ void Movement::draw(bool flipFlag, int angle) { if (_currDynamicPhase->getPaletteData()) g_fp->_globalPalette = _currDynamicPhase->getPaletteData(); - if (_currDynamicPhase->getAlpha() < 0xFF) { - warning("Movement::draw: alpha < 0xff: %d", _currDynamicPhase->getAlpha()); - //vrtSetAlphaBlendMode(g_vrtDrawHandle, 1, _currDynamicPhase->getAlpha()); - } - Bitmap *bmp; if (_currMovement) { bmp = _currDynamicPhase->getPixelData()->reverseImage(); |