[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.20,1.21

Nicolas Bacca arisme at users.sourceforge.net
Sun Mar 28 14:18:07 CEST 2004


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

Modified Files:
	music.cpp 
Log Message:
Fix bug #925059

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- music.cpp	9 Mar 2004 01:48:12 -0000	1.20
+++ music.cpp	28 Mar 2004 21:44:41 -0000	1.21
@@ -264,7 +264,11 @@
 			byte *idx  = ((byte *)data) + 0x200;
 
 			for (uint i = 0; i < packedSize; i++)
+#if defined(SCUMM_NEED_ALIGNMENT)
+				memcpy(&_buf[i], &data[*(idx + i)], sizeof(uint16));
+#else
 				_buf[i] = data[*(idx + i)];
+#endif
 
 			musicPtr = ((byte *)_buf) + ((*musicPtr == 0x63) ? 1 : 0);
 			size = packedSize * 2;





More information about the Scummvm-git-logs mailing list