diff options
author | Paul Gilbert | 2014-08-22 22:15:53 -0400 |
---|---|---|
committer | Paul Gilbert | 2014-08-22 22:15:53 -0400 |
commit | e5130bcc6c2c813fa2ab9238fce277f51a999990 (patch) | |
tree | 80b70d72e3f28fa4ca8fd7dc9ec5226b0ae3cd09 | |
parent | 41df7734db18cf1cb7a2fe4004e3adef98a8cb41 (diff) | |
download | scummvm-rg350-e5130bcc6c2c813fa2ab9238fce277f51a999990.tar.gz scummvm-rg350-e5130bcc6c2c813fa2ab9238fce277f51a999990.tar.bz2 scummvm-rg350-e5130bcc6c2c813fa2ab9238fce277f51a999990.zip |
ACCESS: Remapping of plotting methods
-rw-r--r-- | engines/access/asurface.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp index d3503ef645..f023f9342d 100644 --- a/engines/access/asurface.cpp +++ b/engines/access/asurface.cpp @@ -267,13 +267,11 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) { void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) { - frame->copyTo(this, pt); + sPlotF(frame, Common::Rect(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h)); } void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) { - ASurface flippedFrame; - frame->flipHorizontal(flippedFrame); - flippedFrame.copyTo(this, pt); + sPlotB(frame, Common::Rect(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h)); } void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) { @@ -287,11 +285,10 @@ void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) { } void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) { - Common::Rect r = bounds; - r.clip(Common::Rect(0, 0, this->w, this->h)); + Common::Rect destBounds = bounds; + //destBounds.translate(src->_scrollX, src->_scrollY); - if (r.isValidRect()) - copyRectToSurface(*src, r.left, r.top, r); + copyRectToSurface(*src, destBounds.left, destBounds.top, bounds); } void ASurface::saveBlock(const Common::Rect &bounds) { |