[Scummvm-cvs-logs] SF.net SVN: scummvm:[55716] scummvm/trunk/engines/sci

[mthreepwood at users.sourceforge.net]

Revision: 55716
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55716&view=rev
Author:   mthreepwood
Date:     2011-02-02 02:20:25 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
SCI: Fix Mac sync resource support

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sound/audio.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2011-02-02 00:23:46 UTC (rev 55715)
+++ scummvm/trunk/engines/sci/resource.cpp	2011-02-02 02:20:25 UTC (rev 55716)
@@ -438,7 +438,8 @@
 	// (Audio/36 being Mac snd resources here)
 	return type != kResourceTypeMacPict && type != kResourceTypeAudio &&
 			type != kResourceTypeMacIconBarPictN && type != kResourceTypeMacIconBarPictS &&
-			type != kResourceTypeAudio36;
+			type != kResourceTypeAudio36 && type != kResourceTypeSync &&
+			type != kResourceTypeSync36;
 }
 
 #define OUTPUT_LITERAL() \

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2011-02-02 00:23:46 UTC (rev 55715)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2011-02-02 02:20:25 UTC (rev 55716)
@@ -401,12 +401,12 @@
 void AudioPlayer::doSoundSync(reg_t syncObjAddr, SegManager *segMan) {
 	if (_syncResource && (_syncOffset < _syncResource->size - 1)) {
 		int16 syncCue = -1;
-		int16 syncTime = (int16)READ_LE_UINT16(_syncResource->data + _syncOffset);
+		int16 syncTime = (int16)READ_SCI11ENDIAN_UINT16(_syncResource->data + _syncOffset);
 
 		_syncOffset += 2;
 
 		if ((syncTime != -1) && (_syncOffset < _syncResource->size - 1)) {
-			syncCue = (int16)READ_LE_UINT16(_syncResource->data + _syncOffset);
+			syncCue = (int16)READ_SCI11ENDIAN_UINT16(_syncResource->data + _syncOffset);
 			_syncOffset += 2;
 		}
 


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