diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp index 2370268b403..58c6d010445 100644 --- a/engines/director/channel.cpp +++ b/engines/director/channel.cpp @@ -538,23 +538,19 @@ void Channel::replaceSprite(Sprite *nextSprite) { } void Channel::setWidth(int w) { - if (_sprite->_puppet) { - if (!(_sprite->_cast && _sprite->_cast->_type == kCastShape) && !_sprite->_stretch) - return; - _width = MAX(w, 0); - } + if (!(_sprite->_cast && _sprite->_cast->_type == kCastShape) && !_sprite->_stretch) + return; + _width = MAX(w, 0); } void Channel::setHeight(int h) { - if (_sprite->_puppet) { - if (!(_sprite->_cast && _sprite->_cast->_type == kCastShape) && !_sprite->_stretch) - return; - _height = MAX(h, 0); - } + if (!(_sprite->_cast && _sprite->_cast->_type == kCastShape) && !_sprite->_stretch) + return; + _height = MAX(h, 0); } void Channel::setBbox(int l, int t, int r, int b) { - if (_sprite->_puppet || _sprite->_stretch) { + if (_sprite->_stretch) { if (!(_sprite->_cast && _sprite->_cast->_type == kCastShape) && !_sprite->_stretch) return; _width = r - l; @@ -573,15 +569,13 @@ void Channel::setBbox(int l, int t, int r, int b) { } void Channel::setPosition(int x, int y, bool force) { - if (_sprite->_puppet || force) { - Common::Point newPos(x, y); - if (_constraint > 0 && _score && _constraint <= _score->_channels.size()) { - Common::Rect constraintBbox = _score->_channels[_constraint]->getBbox(); - newPos.x = MIN(constraintBbox.right, MAX(constraintBbox.left, newPos.x)); - newPos.y = MIN(constraintBbox.bottom, MAX(constraintBbox.top, newPos.y)); - } - _currentPoint = newPos; + Common::Point newPos(x, y); + if (_constraint > 0 && _score && _constraint <= _score->_channels.size()) { + Common::Rect constraintBbox = _score->_channels[_constraint]->getBbox(); + newPos.x = MIN(constraintBbox.right, MAX(constraintBbox.left, newPos.x)); + newPos.y = MIN(constraintBbox.bottom, MAX(constraintBbox.top, newPos.y)); } + _currentPoint = newPos; } // here is the place for deciding whether the widget can be keep or not