diff options
-rw-r--r-- | engines/access/asurface.cpp | 14 | ||||
-rw-r--r-- | engines/access/asurface.h | 10 | ||||
-rw-r--r-- | engines/access/screen.cpp | 8 | ||||
-rw-r--r-- | engines/access/screen.h | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp index 9725a5f646..ef8e079c42 100644 --- a/engines/access/asurface.cpp +++ b/engines/access/asurface.cpp @@ -203,7 +203,7 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi } } -void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) { +void ASurface::transCopyFrom(ASurface *src, const Common::Point &destPos) { if (getPixels() == nullptr) create(w, h); @@ -218,7 +218,7 @@ void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) { } } -void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) { +void ASurface::transCopyFrom(ASurface *src, const Common::Rect &bounds) { const int SCALE_LIMIT = 0x100; int scaleX = SCALE_LIMIT * bounds.width() / src->w; int scaleY = SCALE_LIMIT * bounds.height() / src->h; @@ -264,12 +264,12 @@ void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) { } } -void ASurface::copyFrom(ASurface &src) { - copyFrom(&src, Common::Point()); +void ASurface::transCopyFrom(ASurface &src) { + copyFrom(src); } void ASurface::copyBuffer(Graphics::Surface *src) { - Graphics::Surface::copyFrom(*src); + copyFrom(*src); } void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) { @@ -281,14 +281,14 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) { } void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) { - copyFrom(frame, bounds); + transCopyFrom(frame, bounds); } void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) { ASurface flippedFrame; frame->flipHorizontal(flippedFrame); - copyFrom(&flippedFrame, bounds); + transCopyFrom(&flippedFrame, bounds); } void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) { diff --git a/engines/access/asurface.h b/engines/access/asurface.h index 36fd2518c3..c04b33c36e 100644 --- a/engines/access/asurface.h +++ b/engines/access/asurface.h @@ -95,16 +95,16 @@ public: virtual void drawRect(); - virtual void copyFrom(ASurface *src, const Common::Point &destPos); + virtual void transCopyFrom(ASurface *src, const Common::Point &destPos); - virtual void copyFrom(ASurface *src, const Common::Rect &bounds); + virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds); - virtual void copyFrom(ASurface &src); - - void copyTo(ASurface *dest) { dest->copyFrom(*this); } + virtual void transCopyFrom(ASurface &src); virtual void copyBuffer(Graphics::Surface *src); + void copyTo(ASurface *dest) { dest->copyFrom(*this); } + void saveBlock(const Common::Rect &bounds); void moveBufferLeft(); diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index 2276fcc963..5897fbec2e 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -261,14 +261,14 @@ void Screen::drawRect() { ASurface::drawRect(); } -void Screen::copyFrom(ASurface *src, const Common::Point &destPos) { +void Screen::transCopyFrom(ASurface *src, const Common::Point &destPos) { addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h)); - ASurface::copyFrom(src, destPos); + ASurface::transCopyFrom(src, destPos); } -void Screen::copyFrom(ASurface *src, const Common::Rect &bounds) { +void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) { addDirtyRect(bounds); - ASurface::copyFrom(src, bounds); + ASurface::transCopyFrom(src, bounds); } void Screen::copyBuffer(Graphics::Surface *src) { diff --git a/engines/access/screen.h b/engines/access/screen.h index 1d93efbfee..f790dd7986 100644 --- a/engines/access/screen.h +++ b/engines/access/screen.h @@ -89,9 +89,9 @@ public: virtual void drawRect(); - virtual void copyFrom(ASurface *src, const Common::Point &destPos); + virtual void transCopyFrom(ASurface *src, const Common::Point &destPos); - virtual void copyFrom(ASurface *src, const Common::Rect &bounds); + virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds); virtual void copyBuffer(Graphics::Surface *src); public: |