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

[fingolfin at users.sourceforge.net]

Revision: 44851
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44851&view=rev
Author:   fingolfin
Date:     2009-10-09 21:49:04 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
SCI: Fix some weird casting in the vectorPatternCircle and vectorPatternTexturedCircle

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

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-09 21:47:33 UTC (rev 44850)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-09 21:49:04 UTC (rev 44851)
@@ -780,7 +780,7 @@
 
 void SciGuiPicture::vectorPatternCircle(Common::Rect box, byte size, byte color, byte prio, byte control) {
 	byte flag = _screen->getDrawingMask(color, prio, control);
-	byte *circleData = (byte *)&vectorPatternCircles[size];
+	const byte *circleData = vectorPatternCircles[size];
 	byte bitmap = *circleData;
 	byte bitNo = 0;
 	int y, x;
@@ -802,7 +802,7 @@
 
 void SciGuiPicture::vectorPatternTexturedCircle(Common::Rect box, byte size, byte color, byte prio, byte control, byte texture) {
 	byte flag = _screen->getDrawingMask(color, prio, control);
-	byte *circleData = (byte *)&vectorPatternCircles[size];
+	const byte *circleData = vectorPatternCircles[size];
 	byte bitmap = *circleData;
 	byte bitNo = 0;
 	const bool *textureData = &vectorPatternTextures[vectorPatternTextureOffset[texture]];


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