ACCESS: Implemented setBufferScan and copyRects

scummvm · Aug 13, 2014 · 483bc1e · 483bc1e
1 parent b579dbb
commit 483bc1e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
@@ -304,7 +304,10 @@ void AccessEngine::copyBlocks() {
 		_screen->copyBlock(&_buffer2, _oldRects[i]);
 	}
 
-	// Copy the new block list, replacing the old one at the same time
+	copyRects();
+}
+
+void AccessEngine::copyRects() {
 	_oldRects.clear();
 	for (uint i = 0; i < _newRects.size(); ++i) {
 		_screen->copyBlock(&_buffer2, _newRects[i]);

diff --git a/engines/access/access.h b/engines/access/access.h
@@ -242,6 +242,8 @@ class AccessEngine : public Engine {
 	void plotList1();
 
 	void copyBlocks();
+
+	void copyRects();
 };
 
 } // End of namespace Access

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
@@ -123,8 +123,7 @@ void Room::doRoom() {
 					break;
 				} else {
 					_vm->plotList();
-					_vm->_screen->copyRects();
-
+					_vm->copyRects();
 					_vm->_screen->copyBF2Vid();
 				}
 			} else {

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
@@ -172,12 +172,11 @@ void Screen::copyBF2Vid() {
 	warning("TODO");
 }
 
-void Screen::copyRects() {
-	warning("TODO: copyRects");
-}
-
 void Screen::setBufferScan() {
-	warning("TODO: setBufferScan");
+	_clipWidth = _vm->_room->_vWindowBytesWide - 1;
+	_windowXAdd = (320 - _clipWidth) >> 1;
+	_clipHeight = _vm->_room->_vWindowLinesTall - 1;
+	_windowYAdd = (176 - _clipHeight) >> 1;
 }
 
 void Screen::setScaleTable(int scale) {

diff --git a/engines/access/screen.h b/engines/access/screen.h
@@ -123,8 +123,6 @@ class Screen: public ASurface {
 
 	void copyBF2Vid();
 
-	void copyRects();
-
 	void setBufferScan();
 
 	void setScaleTable(int scale);