diff options
| author | Paul Gilbert | 2016-05-26 21:37:52 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-05-26 21:37:52 -0400 |
| commit | 78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c (patch) | |
| tree | fb00b3cdbef3011a309b084d680d139750824701 /engines/mads/user_interface.h | |
| parent | ac8adb07c835885584517674b9b03bab14e8a772 (diff) | |
| download | scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.tar.gz scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.tar.bz2 scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.zip | |
MADS: Refactor MSurface and Screen to not use virtual inheritance
Diffstat (limited to 'engines/mads/user_interface.h')
| -rw-r--r-- | engines/mads/user_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h index 9232dc1bb1..6c9485998a 100644 --- a/engines/mads/user_interface.h +++ b/engines/mads/user_interface.h @@ -238,7 +238,7 @@ public: * @param destPos Destination position to draw in current surface * @param transparencyIndex Transparency color */ - void mergeFrom(MSurface *src, const Common::Rect &srcBounds, const Common::Point &destPos, + void mergeFrom(BaseSurface *src, const Common::Rect &srcBounds, const Common::Point &destPos, int transparencyIndex = -1); /** |