[Scummvm-cvs-logs] SF.net SVN: scummvm:[36199] scummvm/trunk/engines/tinsel/music.cpp

[joostp at users.sourceforge.net]

Revision: 36199
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36199&view=rev
Author:   joostp
Date:     2009-02-02 15:40:11 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
endian safety

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/music.cpp

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2009-02-02 14:54:08 UTC (rev 36198)
+++ scummvm/trunk/engines/tinsel/music.cpp	2009-02-02 15:40:11 UTC (rev 36199)
@@ -802,7 +802,7 @@
 		// Set parameters for this chunk of music
 		id = _scriptNum;
 		while (id--)
-			script = scriptBuffer + FROM_LE_32(*script);
+			script = scriptBuffer + READ_LE_UINT32(script);
 		snum = FROM_LE_32(script[_scriptIndex++]);
 
 		if (snum == MUSIC_JUMP || snum == MUSIC_END) {
@@ -850,16 +850,16 @@
 
 		id = _scriptNum;
 		while (id--)
-			script = scriptBuffer + FROM_LE_32(*script);
+			script = scriptBuffer + READ_LE_UINT32(script);
 
-		switch (script[_scriptIndex]) {
+		switch (FROM_LE_32(script[_scriptIndex])) {
 
 		case MUSIC_END:
 			_state = S_END2;
 			break;
 
 		case MUSIC_JUMP:
-			_scriptIndex = script[++_scriptIndex];
+			_scriptIndex = FROM_LE_32(script[++_scriptIndex]);
 			// Fall through
 		default:
 			if (_forcePlay)


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