aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi/dimuse.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2009-01-10 13:04:33 +0000
committerPaweł Kołodziejski2009-01-10 13:04:33 +0000
commit5fc53e262e01e905ddb093d7228f00d73b8b4ab3 (patch)
tree436d8d0e573ea9834dab64bcd05d9f9c8e34c039 /engines/scumm/imuse_digi/dimuse.cpp
parent6c27a9f00818ce98b7fe1d68fcf237c4b60396da (diff)
downloadscummvm-rg350-5fc53e262e01e905ddb093d7228f00d73b8b4ab3.tar.gz
scummvm-rg350-5fc53e262e01e905ddb093d7228f00d73b8b4ab3.tar.bz2
scummvm-rg350-5fc53e262e01e905ddb093d7228f00d73b8b4ab3.zip
- added initial radio chatter sfx, still not fully correct
- remove obsolete mixerStreamRunning track variable svn-id: r35801
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse.cpp')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp23
1 files changed, 22 insertions, 1 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 2d9ce251a4..54c8c041c4 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -98,6 +98,7 @@ void IMuseDigital::resetState() {
memset(_attributes, 0, sizeof(_attributes));
_nextSeqToPlay = 0;
_stopingSequence = 0;
+ _radioChatterSFX = 0;
_triggerUsed = false;
}
@@ -112,6 +113,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) {
MKLINE(IMuseDigital, _curMusicSeq, sleInt32, VER(31)),
MKLINE(IMuseDigital, _curMusicCue, sleInt32, VER(31)),
MKLINE(IMuseDigital, _nextSeqToPlay, sleInt32, VER(31)),
+ MKLINE(IMuseDigital, _radioChatterSFX, sleByte, VER(76)),
MKARRAY(IMuseDigital, _attributes[0], sleInt32, 188, VER(31)),
MKEND()
};
@@ -128,7 +130,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) {
MKLINE(Track, used, sleByte, VER(31)),
MKLINE(Track, toBeRemoved, sleByte, VER(31)),
MKLINE(Track, souStreamUsed, sleByte, VER(31)),
- MKLINE(Track, mixerStreamRunning, sleByte, VER(31)), // FIXME: OBSOLETE, remove this!
+ MK_OBSOLETE(Track, mixerStreamRunning, sleByte, VER(31), VER(76)),
MKLINE(Track, soundPriority, sleInt32, VER(31)),
MKLINE(Track, regionOffset, sleInt32, VER(31)),
MK_OBSOLETE(Track, trackOffset, sleInt32, VER(31), VER(31)),
@@ -309,6 +311,25 @@ void IMuseDigital::callback() {
}
} else if (bits == 8) {
curFeedSize = _sound->getDataFromRegion(track->soundDesc, track->curRegion, &tmpSndBufferPtr, track->regionOffset, feedSize);
+ if (_radioChatterSFX && track->volGroupId == IMUSE_VOLGRP_VOICE) {
+ byte *buf = new byte[curFeedSize];
+ int index = 0;
+ int count = curFeedSize;
+ byte *ptr_1 = tmpSndBufferPtr;
+ byte *ptr_2 = tmpSndBufferPtr + 4;
+ int value = ptr_1[0] - 0x80;
+ value += ptr_1[1] - 0x80;
+ value += ptr_1[2] - 0x80;
+ value += ptr_1[3] - 0x80;
+ do {
+ int t = *ptr_1++;
+ int v = t - (value / 4);
+ value = (int)(*(ptr_2++) - 0x80) + (value - t + 128);
+ buf[index++] = (byte)v * 4;
+ } while (--count);
+ delete[] tmpSndBufferPtr;
+ tmpSndBufferPtr = buf;
+ }
if (channels == 2) {
curFeedSize &= ~1;
}