[Scummvm-cvs-logs] SF.net SVN: scummvm:[44653] scummvm/trunk/engines/sci/gui

[thebluegr at users.sourceforge.net]

Revision: 44653
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44653&view=rev
Author:   thebluegr
Date:     2009-10-05 07:51:31 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Removed the unused _bytesPerDisplayPixel parameter. All SCI games use 8bpp color (apart from the videos in Phantasmagoria 2, which are not part of the engine itself)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_screen.cpp
    scummvm/trunk/engines/sci/gui/gui_screen.h

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 07:48:43 UTC (rev 44652)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 07:51:31 UTC (rev 44653)
@@ -53,7 +53,6 @@
 	_displayWidth = 320;
 	_displayHeight = 200;
 	_displayPixels = _displayWidth * _displayHeight;
-	_bytesPerDisplayPixel = 1;
 
 	_visualScreen = initScreen(_pixels);
 	_priorityScreen = initScreen(_pixels);
@@ -133,15 +132,11 @@
 int SciGuiScreen::getBitsDataSize(Common::Rect rect, byte mask) {
 	int byteCount = sizeof(rect) + sizeof(mask);
 	int pixels = rect.width() * rect.height();
-	if (mask & SCI_SCREEN_MASK_VISUAL) {
-		byteCount += pixels + (pixels * _bytesPerDisplayPixel);
-	}
-	if (mask & SCI_SCREEN_MASK_PRIORITY) {
+	byteCount += pixels;
+
+	if (mask & SCI_SCREEN_MASK_VISUAL)
 		byteCount += pixels;
-	}
-	if (mask & SCI_SCREEN_MASK_CONTROL) {
-		byteCount += pixels;
-	}
+
 	return byteCount;
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_screen.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.h	2009-10-05 07:48:43 UTC (rev 44652)
+++ scummvm/trunk/engines/sci/gui/gui_screen.h	2009-10-05 07:51:31 UTC (rev 44653)
@@ -67,7 +67,6 @@
 	uint16 _displayWidth;
 	uint16 _displayHeight;
 	uint _displayPixels;
-	byte _bytesPerDisplayPixel;
 
 private:
 	void restoreBitsScreen(Common::Rect rect, byte *&memoryPtr, byte *screen);


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