thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Refactor MSurface and Screen to not use virtual inheritance

Browse source
This commit is contained in:
Paul Gilbert 2016-05-26 21:37:52 -04:00
parent ac8adb07c8
commit 78e52365bd
19 changed files with 69 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/mads/user_interface.h
View file

@ -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);
/**