diff options
-rw-r--r-- | engines/director/score.cpp | 7 | ||||
-rw-r--r-- | engines/director/score.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 7a3e8864e6..e184b7183a 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -462,11 +462,11 @@ void Frame::readSprite(Common::SeekableReadStream &stream, uint16 offset, uint16 fieldPosition += 2; break; case kSpritePositionWidth: - sprite._height = stream.readUint16BE(); + sprite._width = stream.readUint16BE(); fieldPosition += 2; break; case kSpritePositionHeight: - sprite._width = stream.readUint16BE(); + sprite._height = stream.readUint16BE(); fieldPosition += 2; break; default: @@ -518,7 +518,7 @@ void Frame::display(Archive &_movie, Graphics::ManagedSurface &surface, Common:: Common::Rect drawRect = Common::Rect(x, y, x + width, y + height); - switch(_sprites[i]->_ink) { + switch (_sprites[i]->_ink) { case kInkTypeCopy: surface.blitFrom(*img.getSurface(), Common::Point(x, y)); break; @@ -533,6 +533,7 @@ void Frame::display(Archive &_movie, Graphics::ManagedSurface &surface, Common:: surface.blitFrom(*img.getSurface(), Common::Point(x, y)); break; } + surface.frameRect(drawRect, 0); } } g_system->copyRectToScreen(surface.getPixels(), surface.pitch, 0, 0, surface.getBounds().width(), surface.getBounds().height()); diff --git a/engines/director/score.h b/engines/director/score.h index 21756be212..7c2a75fc7e 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -53,8 +53,8 @@ enum spritePositions { kSpritePositionCastId = 6, kSpritePositionY = 8, kSpritePositionX = 10, - kSpritePositionWidth = 12, - kSpritePositionHeight = 14 + kSpritePositionHeight = 12, + kSpritePositionWidth = 14 }; enum mainChannelsPosition { |