[Scummvm-cvs-logs] scummvm master -> 07b554b847d9675d5d97b7ea36ac87ce17e6a1f3

Strangerke Strangerke at scummvm.org
Sat Dec 26 16:04:45 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
07b554b847 LAB: Add an access function to make _headerData a private member of Anim


Commit: 07b554b847d9675d5d97b7ea36ac87ce17e6a1f3
    https://github.com/scummvm/scummvm/commit/07b554b847d9675d5d97b7ea36ac87ce17e6a1f3
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-12-26T13:53:11+01:00

Commit Message:
LAB: Add an access function to make _headerData a private member of Anim

Changed paths:
    engines/lab/anim.cpp
    engines/lab/anim.h
    engines/lab/dispman.cpp



diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index 92ca49b..ea7f568 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -80,6 +80,9 @@ void Anim::setOutputBuffer(byte *memoryBuffer) {
 	_outputBuffer = memoryBuffer;
 }
 
+uint16 Anim::getDIFFHeight() {
+	return _headerdata._height;
+}
 
 void Anim::diffNextFrame(bool onlyDiffData) {
 	if (_lastBlockHeader == 65535)
@@ -90,7 +93,7 @@ void Anim::diffNextFrame(bool onlyDiffData) {
 	byte *startOfBuf = _outputBuffer;
 	int bufPitch = _vm->_graphics->_screenWidth;
 
-	if (!_outputBuffer) {
+	if (!startOfBuf) {
 		startOfBuf = _vm->_graphics->getCurrentDrawingBuffer();
 		drawOnScreen = true;
 	}
diff --git a/engines/lab/anim.h b/engines/lab/anim.h
index 1979aa5..e9bc858 100644
--- a/engines/lab/anim.h
+++ b/engines/lab/anim.h
@@ -66,12 +66,12 @@ private:
 	uint32 _diffHeight;
 
 	byte *_outputBuffer;
+	DIFFHeader _headerdata;
 
 public:
 	Anim(LabEngine *vm);
 	virtual ~Anim();
 
-	DIFFHeader _headerdata;
 	char _diffPalette[256 * 3];
 	bool _waitForEffect; // Wait for each sound effect to finish before continuing.
 	bool _doBlack;       // Black the screen before new picture
@@ -94,6 +94,8 @@ public:
 	 * Stops an animation from running.
 	 */
 	void stopDiffEnd();
+
+	uint16 getDIFFHeight();
 };
 
 } // End of namespace Lab
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 4f0f2b5..0b41193 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -673,20 +673,19 @@ void DisplayMan::doScrollWipe(const Common::String filename) {
 	uint16 nheight = height;
 	uint16 startLine = 0, onRow = 0;
 
-	while (onRow < _vm->_anim->_headerdata._height) {
+	while (onRow < _vm->_anim->getDIFFHeight()) {
 		_vm->updateMusicAndEvents();
 
 		if ((by > nheight) && nheight)
 			by = nheight;
 
-		if ((startLine + by) > (_vm->_anim->_headerdata._height - height - 1))
+		if ((startLine + by) > (_vm->_anim->getDIFFHeight() - height - 1))
 			break;
 
 		if (nheight)
 			nheight -= by;
 
 		copyPage(width, height, nheight, startLine, mem);
-
 		screenUpdate();
 
 		if (!nheight)
@@ -715,7 +714,7 @@ void DisplayMan::doScrollBounce() {
 	byte *mem = _vm->_anim->_scrollScreenBuffer;
 
 	_vm->updateMusicAndEvents();
-	int startLine = _vm->_anim->_headerdata._height - height - 1;
+	int startLine = _vm->_anim->getDIFFHeight() - height - 1;
 
 	for (int i = 0; i < 5; i++) {
 		_vm->updateMusicAndEvents();






More information about the Scummvm-git-logs mailing list