diff options
author | Paul Gilbert | 2014-12-19 22:45:00 -0500 |
---|---|---|
committer | Paul Gilbert | 2014-12-19 22:45:00 -0500 |
commit | 37b5ee24f520e46eae28c703d189939e0b18c65b (patch) | |
tree | 9285dbd7ce831c98579fe3a340bd4d36cd5f8f49 /engines/access/screen.cpp | |
parent | 808a2045b4a3b210f1f2512617fe1be41c5dc460 (diff) | |
download | scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.tar.gz scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.tar.bz2 scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.zip |
ACCESS: Rename ASurface copyFrom methods to avoid clash with Graphics::Surface
Diffstat (limited to 'engines/access/screen.cpp')
-rw-r--r-- | engines/access/screen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index 35069ba683..d6fddb73b2 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -266,19 +266,19 @@ void Screen::drawRect() { ASurface::drawRect(); } -void Screen::transCopyFrom(ASurface *src, const Common::Point &destPos) { +void Screen::transBlitFrom(ASurface *src, const Common::Point &destPos) { addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h)); - ASurface::transCopyFrom(src, destPos); + ASurface::transBlitFrom(src, destPos); } -void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) { +void Screen::transBlitFrom(ASurface *src, const Common::Rect &bounds) { addDirtyRect(bounds); - ASurface::transCopyFrom(src, bounds); + ASurface::transBlitFrom(src, bounds); } -void Screen::copyFrom(Graphics::Surface &src) { +void Screen::blitFrom(Graphics::Surface &src) { addDirtyRect(Common::Rect(0, 0, src.w, src.h)); - ASurface::copyFrom(src); + ASurface::blitFrom(src); } void Screen::copyBuffer(Graphics::Surface *src) { |