libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 20:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changing the TBR FIXME into a warning in setVoice()

Browse Source 
svn-id: r41803
This commit is contained in:
Sven Hesse 2009-06-23 08:51:55 +00:00
parent b6e1787d72
commit 65891626a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/gob/sound/adlib.cpp
View File

@ -549,12 +549,7 @@ bool MDYPlayer::loadTBR(Common::SeekableReadStream &stream) {
_timbresSize = stream.size();
// FIXME: _timbresSize is smaller than setVoice() expects!
uint32 rSize = MAX<uint32>(_timbresSize, 810);
_timbres = new byte[rSize];
memset(_timbres, 0, rSize);
_timbres = new byte[_timbresSize];
stream.read(_timbres, _timbresSize);
reset();
@ -754,7 +749,12 @@ void MDYPlayer::setVoice(byte voice, byte instr, bool set) {
for (int i = 0; i < 2; i++) {
timbrePtr = _timbres + _tbrStart + instr * 0x38 + i * 0x1A;
for (int j = 0; j < 27; j++) {
strct[j] = READ_LE_UINT16(timbrePtr);
if (timbrePtr >= (_timbres + _timbresSize)) {
warning("Instrument %d out of range (%d, %d)", instr,
(uint32) (timbrePtr - _timbres), _timbresSize);
strct[j] = 0;
} else
strct[j] = READ_LE_UINT16(timbrePtr);
timbrePtr += 2;
}
channel = _operators[voice] + i * 3;