[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.31,1.32

Nicolas Bacca arisme at users.sourceforge.net
Mon Jan 10 12:50:11 CET 2005


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19569

Modified Files:
	music.cpp 
Log Message:
Fix alignment problem

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- music.cpp	6 Jan 2005 11:46:32 -0000	1.31
+++ music.cpp	10 Jan 2005 20:49:35 -0000	1.32
@@ -272,7 +272,7 @@
 
 		for (uint i = 0; i < packedSize; i++)
 #if defined(SCUMM_NEED_ALIGNMENT)
-			memcpy(&_buf[i], &data[*(idx + i)], sizeof(uint16));
+			memcpy(&_buf[i], (byte*)((byte*)data + *(idx + i) * sizeof(uint16)), sizeof(uint16));
 #else
 			_buf[i] = data[*(idx + i)];
 #endif





More information about the Scummvm-git-logs mailing list