[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.25.2.3,1.25.2.4
Nicolas Bacca
arisme at users.sourceforge.net
Mon Jan 10 12:49:08 CET 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19222
Modified Files:
Tag: branch-0-7-0
music.cpp
Log Message:
Fix alignment problem
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -d -r1.25.2.3 -r1.25.2.4
--- music.cpp 23 Dec 2004 04:53:11 -0000 1.25.2.3
+++ music.cpp 10 Jan 2005 20:48:19 -0000 1.25.2.4
@@ -277,7 +277,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