Ticket #8851: bs1-mac-en-v2.patch

engines/sword1/sword1.cpp

@@ -139 +139 @@
 
         _systemVars.playSpeech = 1;
         _mouseState = 0;
+        
+        // Some Mac versions use big endian for the speech files but not all of them.
+        // The speech files have always the clu extension (and not the clm for big endian)
+        // and the only way I have found to try to guess if we should use big endian is by
+        // testing the language.
+        // Mac BS1 english full version: big endian.
+        // PC BS1 (all language) & Mac BS1 french : little endian.
+        // Mac BS1 all other language: not known. Currently set on little endian.
+        // Mac BS1 demo: not known, set to the same than the full version (i.e. english uses big endian).
+        if (SwordEngine::isMac() && _systemVars.language == BS1_ENGLISH)
+                _sound->setIsBigEndianSpeech(true);
 
         _logic->initialize();
         _objectMan->initialize();

engines/sword1/sound.h

@@ -94 +94 @@
         int addToQueue(int32 fxNo);
 
         void engine(void);
+        
+        void setIsBigEndianSpeech(bool);
 
 private:
         uint8 _sfxVolL, _sfxVolR, _speechVolL, _speechVolR;
@@ -116 +118 @@
         uint8            _endOfQueue;
         Audio::Mixer *_mixer;
         ResMan *_resMan;
+        bool _bigEndianSpeech;
         char _filePath[100];
         static const char _musicList[270];
         static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM];

engines/sword1/sound.cpp

@@ -51 +51 @@
         strcpy(_filePath, searchPath);
         _mixer = mixer;
         _resMan = pResMan;
+        _bigEndianSpeech = false;
         _cowHeader = NULL;
         _endOfQueue = 0;
         _currentCowFile = 0;
@@ -67 +68 @@
         closeCowSystem();
 }
 
+void Sound::setIsBigEndianSpeech(bool isBE) {
+        _bigEndianSpeech = isBE;
+}
+
 int Sound::addToQueue(int32 fxNo) {
         bool alreadyInQueue = false;
         for (uint8 cnt = 0; (cnt < _endOfQueue) && (!alreadyInQueue); cnt++)
@@ -384 +389 @@
                 int16 *dstData = (int16*)malloc(resSize * 2);
                 int32 samplesLeft = resSize;
                 while (srcPos < cSize && samplesLeft > 0) {
-                        length = (int16)READ_LE_UINT16(srcData + srcPos);
+                        length = (int16)(_bigEndianSpeech ? READ_BE_UINT16(srcData + srcPos) : READ_LE_UINT16(srcData + srcPos));
                         srcPos++;
                         if (length < 0) {
                                 length = -length;
                                 if (length > samplesLeft)
                                         length = samplesLeft;
+
+                                int16 value;
+                                if (_bigEndianSpeech) {
+                                        value = (int16)SWAP_BYTES_16(*((uint16*)(srcData + srcPos)));
+                                } else {
+                                        value = srcData[srcPos];
+                                }
+
                                 for (uint16 cnt = 0; cnt < (uint16)length; cnt++)
-                                        dstData[dstPos++] = srcData[srcPos];
+                                        dstData[dstPos++] = value;
+
                                 srcPos++;
                         } else {
                                 if (length > samplesLeft)
                                         length = samplesLeft;
-                                memcpy(dstData + dstPos, srcData + srcPos, length * 2);
-                                dstPos += length;
-                                srcPos += length;
+
+                                if (_bigEndianSpeech) {
+                                        for (uint16 cnt = 0; cnt < (uint16)length; cnt++)
+                                                dstData[dstPos++] = (int16)SWAP_BYTES_16(*((uint16*)(srcData + (srcPos++))));
+                                } else {
+                                        memcpy(dstData + dstPos, srcData + srcPos, length * 2);
+                                        dstPos += length;
+                                        srcPos += length;
+                                }
                         }
                         samplesLeft -= length;
                 }