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

[m_kiewitz at users.sourceforge.net]

Revision: 51971
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51971&view=rev
Author:   m_kiewitz
Date:     2010-08-11 12:01:56 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
SCI: kAddToPic only wrote nsRect in sci1.1

fixes regression of r51952 and bug #3042957

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.cpp
    scummvm/trunk/engines/sci/graphics/animate.h

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-11 06:13:08 UTC (rev 51970)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-11 12:01:56 UTC (rev 51971)
@@ -190,7 +190,7 @@
 	Common::sort(_list.begin(), _list.end(), sortHelper);
 }
 
-void GfxAnimate::fill(byte &old_picNotValid) {
+void GfxAnimate::fill(byte &old_picNotValid, bool maySetNsRect) {
 	reg_t curObject;
 	uint16 signal;
 	GfxView *view = NULL;
@@ -254,7 +254,7 @@
 			it->scaleY = it->scaleX = 128;
 		}
 
-		bool setNsRect = true;
+		bool setNsRect = maySetNsRect;
 
 		// Create rect according to coordinates and given cel
 		if (it->scaleSignal & kScaleSignalDoScaling) {
@@ -615,7 +615,7 @@
 	disposeLastCast();
 
 	makeSortedList(list);
-	fill(old_picNotValid);
+	fill(old_picNotValid, true);
 
 	if (old_picNotValid) {
 		// beginUpdate()/endUpdate() were introduced SCI1.
@@ -700,7 +700,7 @@
 
 	makeSortedList(list);
 	preprocessAddToPicList();
-	fill(tempPicNotValid);
+	fill(tempPicNotValid, getSciVersion() >= SCI_VERSION_1_1 ? true : false);
 	addToPicDrawCels();
 
 	addToPicSetPicNotValid();

Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h	2010-08-11 06:13:08 UTC (rev 51970)
+++ scummvm/trunk/engines/sci/graphics/animate.h	2010-08-11 12:01:56 UTC (rev 51971)
@@ -94,7 +94,7 @@
 	void disposeLastCast();
 	bool invoke(List *list, int argc, reg_t *argv);
 	void makeSortedList(List *list);
-	void fill(byte &oldPicNotValid);
+	void fill(byte &oldPicNotValid, bool maySetNsRect);
 	void update();
 	void drawCels();
 	void updateScreen(byte oldPicNotValid);


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