ACCESS: Dirty rect handling for intro screens

scummvm · Dec 14, 2014 · 924f2ab · 924f2ab
1 parent 9397948
commit 924f2ab
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
@@ -268,6 +268,10 @@ void ASurface::transCopyFrom(ASurface &src) {
 	copyFrom(src);
 }
 
+void ASurface::copyFrom(Graphics::Surface &src) {
+	Graphics::Surface::copyFrom(src);
+}
+
 void ASurface::copyBuffer(Graphics::Surface *src) {
 	copyFrom(*src);
 }

diff --git a/engines/access/asurface.h b/engines/access/asurface.h
@@ -101,6 +101,8 @@ class ASurface : public Graphics::Surface {
 
 	virtual void transCopyFrom(ASurface &src);
 
+	virtual void copyFrom(Graphics::Surface &src);
+
 	virtual void copyBuffer(Graphics::Surface *src);
 
 	void copyTo(ASurface *dest) { dest->copyFrom(*this); }

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
@@ -168,6 +168,9 @@ void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
 			res->_stream->read(pDest, dest->w);
 		}
 	}
+
+	if (dest == _vm->_screen)
+		_vm->_screen->addDirtyRect(Common::Rect(0, 0, dest->w, dest->h));
 }
 
 void FileManager::loadScreen(int fileNum, int subfile) {

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
@@ -271,6 +271,11 @@ void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
 	ASurface::transCopyFrom(src, bounds);
 }
 
+void Screen::copyFrom(Graphics::Surface &src) {
+	addDirtyRect(Common::Rect(0, 0, src.w, src.h));
+	ASurface::copyFrom(src);
+}
+
 void Screen::copyBuffer(Graphics::Surface *src) {
 	addDirtyRect(Common::Rect(0, 0, src->w, src->h));
 	ASurface::copyBuffer(src);

diff --git a/engines/access/screen.h b/engines/access/screen.h
@@ -93,6 +93,8 @@ class Screen: public ASurface {
 
 	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
 
+	virtual void copyFrom(Graphics::Surface &src);
+
 	virtual void copyBuffer(Graphics::Surface *src);
 public:
 	Screen(AccessEngine *vm);