[Scummvm-cvs-logs] SF.net SVN: scummvm: [22291] scummvm/trunk/engines/simon/icons.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue May 2 21:40:03 CEST 2006


Revision: 22291
Author:   kirben
Date:     2006-05-02 21:39:31 -0700 (Tue, 02 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22291&view=rev

Log Message:
-----------
Read correct offset in loadIconData()

Modified Paths:
--------------
    scummvm/trunk/engines/simon/icons.cpp
Modified: scummvm/trunk/engines/simon/icons.cpp
===================================================================
--- scummvm/trunk/engines/simon/icons.cpp	2006-05-03 04:07:37 UTC (rev 22290)
+++ scummvm/trunk/engines/simon/icons.cpp	2006-05-03 04:39:31 UTC (rev 22291)
@@ -50,13 +50,8 @@
 	loadZone(8);
 	VgaPointersEntry *vpe = &_vgaBufferPointers[8];
 
-	// FIXME: For reasons unknown, the first 16 bytes are not part of the
-	// actual image data. This could be an indication of some deeper
-	// problem elsewhere. For now, adding 16 fixes the drawing of the
-	// Oracle icon.
+	byte *src = vpe->vgaFile2 + READ_LE_UINT32(vpe->vgaFile2 + 8);
 
-	byte *src = vpe->vgaFile2 + 16;
-
 	_iconFilePtr = (byte *)malloc(43 * 336);
 	if (_iconFilePtr == NULL)
 		error("Out of icon memory");


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





More information about the Scummvm-git-logs mailing list