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

Merge branch 'master' into mm

Browse source 
Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h
This commit is contained in:
Willem Jan Palenstijn 2015-07-22 22:37:40 +02:00
commit 6ec9c81b57
885 changed files with 76342 additions and 29223 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/access/screen.h
View file

@ -94,11 +94,11 @@ public:
virtual void drawBox();
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 copyFrom(Graphics::Surface &src);
virtual void blitFrom(Graphics::Surface &src);
virtual void copyBuffer(Graphics::Surface *src);