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

[lordhoto at users.sourceforge.net]

Revision: 51561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51561&view=rev
Author:   lordhoto
Date:     2010-08-01 01:00:30 +0000 (Sun, 01 Aug 2010)

Log Message:
-----------
SCI: Fix uninitialized variable warning in g++.

Thanks to clone2727 for suggestion to initialize the default new plane
priority to 0xFFFF, which means that the plane should be invisible. I added a
FIXME there though. So please re check this change. In case that is fine just
remove the FIXME, in case some other default value should be chosen, please
change the value and also remove the FIXME.

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

Modified: scummvm/trunk/engines/sci/graphics/frameout.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-07-31 23:50:54 UTC (rev 51560)
+++ scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-08-01 01:00:30 UTC (rev 51561)
@@ -68,6 +68,9 @@
 
 	newPlane.object = object;
 	newPlane.pictureId = 0xFFFF;
+	// TODO/FIXME: Check whether we should really default initialize the
+	// priority to 0xFFFF here.
+	newPlane.priority = 0xFFFF;
 	newPlane.lastPriority = 0xFFFF; // hidden
 	_planes.push_back(newPlane);
 
@@ -125,6 +128,7 @@
 	newPicture.pictureId = pictureId;
 	newPicture.picture = new GfxPicture(_resMan, _coordAdjuster, 0, _screen, _palette, pictureId, false);
 	newPicture.startX = startX;
+	newPicture.pictureCels = 0;
 	_planePictures.push_back(newPicture);
 }
 


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