Removed useless mask width and size data members from engine.

svn-id: r28474

4 files changed, 4 insertions, 9 deletions

diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 7949be4a0b..9c93a9f9df 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -628,7 +628,7 @@ void DosDisk_ns::loadMaskAndPath(const char *name) {
 	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 @@ void AmigaDisk_ns::loadMask(const char *name) {
 
 	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;
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 0eba2b8db3..5f33b49cda 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -810,11 +810,11 @@ void Gfx::zeroMaskValue(uint16 x, uint16 y, byte color) {
 }
 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;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 986bc6ebd7..0953bcd27f 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -164,10 +164,8 @@ int Parallaction::init() {
 	_location._comment = NULL;
 	_location._endComment = NULL;
 
-	_screenMaskWidth = _screenWidth / 4;
 	_screenPathWidth = _screenWidth / 8;
 	_screenSize = _screenWidth * _screenHeight;
-	_screenMaskSize = _screenMaskWidth * _screenHeight;
 	_screenPathSize = _screenPathWidth * _screenHeight;
 
 	strcpy(_characterName1, "null");
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 31b125c92a..c7eb30a746 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -359,8 +359,6 @@ public:
 	int32 			_screenHeight;
 	int32 			_screenSize;
 
-	int32 			_screenMaskWidth;
-	int32 			_screenMaskSize;
 	int32 			_screenPathWidth;
 	int32 			_screenPathSize;