[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2a.cpp,2.15,2.16 player_v3a.cpp,1.16,1.17 player_v3a.h,1.15,1.16
Travis Howell
kirben at users.sourceforge.net
Sun Dec 14 00:59:00 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20083/scumm
Modified Files:
player_v2a.cpp player_v3a.cpp player_v3a.h
Log Message:
More Amiga sound updates from tsuteiuQ:
Adds another sound effect for zak
Cleans up end-of-song handling in v3 games
Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- player_v2a.cpp 5 Dec 2003 05:57:28 -0000 2.15
+++ player_v2a.cpp 14 Dec 2003 08:57:53 -0000 2.16
@@ -986,6 +986,52 @@
int _ticks;
};
+class V2A_Sound_Special_SteppedPitchbendAndHold : public V2A_Sound_Base<1> {
+public:
+ V2A_Sound_Special_SteppedPitchbendAndHold(uint16 offset, uint16 size, uint16 freq1, uint16 freq2, uint8 vol) :
+ V2A_Sound_Base<1>(offset, size), _freq1(freq1), _freq2(freq2), _vol(vol) { }
+ virtual void start(Player_MOD *mod, int id, const byte *data) {
+ _mod = mod;
+ _id = id;
+ char *tmp_data = (char *)malloc(_size);
+ memcpy(tmp_data, data + _offset, _size);
+ _curfreq = _freq1;
+ _mod->startChannel(_id, tmp_data, _size, BASE_FREQUENCY / _curfreq, (_vol << 2) | (_vol >> 4), 0, _size);
+ _bendrate = 8;
+ _bendctr = 100;
+ _holdctr = 30;
+ }
+ virtual bool update() {
+ assert(_id);
+ if (_curfreq >= _freq2)
+ {
+ _mod->setChannelFreq(_id, BASE_FREQUENCY / _curfreq);
+ _curfreq -= _bendrate;
+ if (--_bendctr)
+ return true;
+ _bendrate--;
+ if (_bendrate < 2)
+ _bendrate = 2;
+ }
+ else
+ {
+ if (!--_holdctr)
+ return false;
+ }
+ return true;
+ }
+private:
+ const uint16 _freq1;
+ const uint16 _freq2;
+ const uint16 _vol;
+
+ uint16 _curfreq;
+ uint16 _bendrate;
+ uint16 _bendctr;
+ uint16 _holdctr;
+
+};
+
#define CRCToSound(CRC, SOUND) \
if (crc == CRC) \
return new SOUND
@@ -1078,7 +1124,7 @@
CRCToSound(0x5AE9D6A7, V2A_Sound_Special_SlowPitchbendThenSlowFadeout(0x00CA,0x22A4,0x0113,0x0227)); // Zak 109
CRCToSound(0xABE0D3B0, V2A_Sound_Special_SlowPitchbendThenSlowFadeout(0x00CE,0x22A4,0x0227,0x0113)); // Zak 105
CRCToSound(0x788CC749, V2A_Sound_Unsupported()); // Zak 71
- CRCToSound(0x2E2AB1FA, V2A_Sound_Unsupported()); // Zak 99
+ CRCToSound(0x2E2AB1FA, V2A_Sound_Special_SteppedPitchbendAndHold(0x00D4,0x04F0,0x0FE3,0x0080,0x3F)); // Zak 99
CRCToSound(0x1304CF20, V2A_Sound_Special_SingleDurationMultiDurations(0x00DC,0x0624,0x023C,0x3C,2,(const uint8 *)"\x14\x11",false)); // Zak 79
CRCToSound(0xAE68ED91, V2A_Sound_Unsupported()); // Zak 54
CRCToSound(0xA4F40F97, V2A_Sound_Unsupported()); // Zak 61
Index: player_v3a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- player_v3a.cpp 8 Nov 2003 21:59:32 -0000 1.16
+++ player_v3a.cpp 14 Dec 2003 08:57:53 -0000 1.17
@@ -232,6 +232,11 @@
looped = true;
}
int i = getSfxChan();
+ if (i == -1)
+ {
+ free(sound);
+ return;
+ }
_sfx[i].id = nr;
_sfx[i].dur = looped ? -1 : (1 + 60 * size / rate);
if ((_scumm->_gameId == GID_INDY3) && (nr == 60))
@@ -270,7 +275,7 @@
return;
if (_songDelay && --_songDelay)
return;
- if (((_songData[_songPtr] & 0xF0) != 0x80) && (_songData[_songPtr] != 0xFB)) {
+ if (_songPtr == 0) {
// at the end of the song, and it wasn't looped - kill it
_curSong = 0;
return;
@@ -287,6 +292,7 @@
}
if (inst == 0xFB) // it's a looped song, restart it afterwards
_songPtr = 0x1C;
+ else _songPtr = 0; // otherwise, terminate it
break;
}
inst &= 0xF;
@@ -312,8 +318,13 @@
memcpy(data + _wavetable[inst]->_ilen[oct], _wavetable[inst]->_ldat[oct], _wavetable[inst]->_llen[oct]);
i = getMusChan();
+ if (i == -1)
+ {
+ free(data);
+ return;
+ }
_mus[i].id = i + 1;
- _mus[i].dur = dur;
+ _mus[i].dur = dur + 1;
_mod->startChannel(_mus[i].id, data, _wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct], rate, vol,
_wavetable[inst]->_ilen[oct], _wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct]);
}
Index: player_v3a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- player_v3a.h 8 Nov 2003 21:59:32 -0000 1.15
+++ player_v3a.h 14 Dec 2003 08:57:53 -0000 1.16
@@ -51,8 +51,8 @@
private:
enum {
- V3A_MAXMUS = 8,
- V3A_MAXSFX = 8
+ V3A_MAXMUS = 16,
+ V3A_MAXSFX = 16
};
struct musChan {
More information about the Scummvm-git-logs
mailing list