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

[wjpalenstijn at users.sourceforge.net]

Revision: 44682
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44682&view=rev
Author:   wjpalenstijn
Date:     2009-10-05 23:00:48 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
SCI: Make getBitsDataSize use the same logic as saveBits

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

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 22:42:41 UTC (rev 44681)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 23:00:48 UTC (rev 44682)
@@ -127,11 +127,17 @@
 int SciGuiScreen::getBitsDataSize(Common::Rect rect, byte mask) {
 	int byteCount = sizeof(rect) + sizeof(mask);
 	int pixels = rect.width() * rect.height();
-	byteCount += pixels;
+	if (mask & SCI_SCREEN_MASK_VISUAL) {
+		byteCount += pixels; // _visualScreen
+		byteCount += pixels; // _displayScreen
+	}
+	if (mask & SCI_SCREEN_MASK_PRIORITY) {
+		byteCount += pixels; // _priorityScreen
+	}
+	if (mask & SCI_SCREEN_MASK_CONTROL) {
+		byteCount += pixels; // _controlScreen
+	}
 
-	if (mask & SCI_SCREEN_MASK_VISUAL)
-		byteCount += pixels;
-
 	return byteCount;
 }
 


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