[Scummvm-cvs-logs] SF.net SVN: scummvm: [28474] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 28474
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28474&view=rev
Author:   peres001
Date:     2007-08-06 12:43:33 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
Removed useless mask width and size data members from engine.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk_ns.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp	2007-08-06 19:39:00 UTC (rev 28473)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp	2007-08-06 19:43:33 UTC (rev 28474)
@@ -628,7 +628,7 @@
 	parseDepths(_resArchive);
 
 	_resArchive.read(pathBuf, _vm->_screenPathSize);
-	_resArchive.read(mask->data, _vm->_screenMaskSize);
+	_resArchive.read(mask->data, mask->size);
 
 	_vm->_gfx->setMask(mask);
 	_vm->setPath(pathBuf);
@@ -1239,9 +1239,8 @@
 
 	BitBuffer *mask = new BitBuffer;
 	mask->create(_vm->_screenWidth, _vm->_screenHeight);
-	stream.read(mask->data, _vm->_screenMaskSize);
+	stream.read(mask->data, mask->size);
 	buildMask(mask->data);
-
 	_vm->_gfx->setMask(mask);
 
 	delete s;

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-08-06 19:39:00 UTC (rev 28473)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-08-06 19:43:33 UTC (rev 28474)
@@ -810,11 +810,11 @@
 }
 void Gfx::fillMaskRect(const Common::Rect& r, byte color) {
 
-	uint16 _di = r.left/4 + r.top * _vm->_screenMaskWidth;
+	uint16 _di = r.left/4 + r.top * _depthMask->internalWidth;
 
 	for (uint16 _si = r.top; _si < r.bottom; _si++) {
 		memset(_depthMask->data + _di, color, r.width()/4+1);
-		_di += _vm->_screenMaskWidth;
+		_di += _depthMask->internalWidth;
 	}
 
 	return;

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-08-06 19:39:00 UTC (rev 28473)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-08-06 19:43:33 UTC (rev 28474)
@@ -164,10 +164,8 @@
 	_location._comment = NULL;
 	_location._endComment = NULL;
 
-	_screenMaskWidth = _screenWidth / 4;
 	_screenPathWidth = _screenWidth / 8;
 	_screenSize = _screenWidth * _screenHeight;
-	_screenMaskSize = _screenMaskWidth * _screenHeight;
 	_screenPathSize = _screenPathWidth * _screenHeight;
 
 	strcpy(_characterName1, "null");

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-08-06 19:39:00 UTC (rev 28473)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-08-06 19:43:33 UTC (rev 28474)
@@ -359,8 +359,6 @@
 	int32 			_screenHeight;
 	int32 			_screenSize;
 
-	int32 			_screenMaskWidth;
-	int32 			_screenMaskSize;
 	int32 			_screenPathWidth;
 	int32 			_screenPathSize;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.