aboutsummaryrefslogtreecommitdiff
path: root/engines/access/asurface.h
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-19 22:45:00 -0500
committerPaul Gilbert2014-12-19 22:45:00 -0500
commit37b5ee24f520e46eae28c703d189939e0b18c65b (patch)
tree9285dbd7ce831c98579fe3a340bd4d36cd5f8f49 /engines/access/asurface.h
parent808a2045b4a3b210f1f2512617fe1be41c5dc460 (diff)
downloadscummvm-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/asurface.h')
-rw-r--r--engines/access/asurface.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 763e3e629e..4fb47b9c09 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -95,19 +95,19 @@ public:
virtual void drawRect();
- virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
+ virtual void transBlitFrom(ASurface *src, const Common::Point &destPos);
- virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
+ virtual void transBlitFrom(ASurface *src, const Common::Rect &bounds);
- virtual void transCopyFrom(ASurface &src);
+ virtual void transBlitFrom(ASurface &src);
- virtual void copyFrom(Graphics::Surface &src);
+ virtual void blitFrom(Graphics::Surface &src);
virtual void copyBuffer(Graphics::Surface *src);
virtual void addDirtyRect(const Common::Rect &r) {}
- void copyTo(ASurface *dest) { dest->copyFrom(*this); }
+ void copyTo(ASurface *dest) { dest->blitFrom(*this); }
void saveBlock(const Common::Rect &bounds);