thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add raw PCM part to dig .bun decompressor.

Browse source 
svn-id: r4219
This commit is contained in:
James Brown 2002-05-06 15:32:32 +00:00
parent 1dc2ccca8d
commit 21e14b44c5
6 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
insane.cpp
View file

@ -130,6 +130,16 @@ void SmushPlayer::parseAHDR()
}
void SmushPlayer::parseIACT() {
unsigned char *src = _cur;
int size, codec;
_cur-=8; /* Move back to beginning of IACT block */
_cur+=4; size = READ_BE_UINT32(_cur) - 18;
_cur+=10; codec = READ_LE_UINT16(_cur);
_cur = src;
}
void SmushPlayer::parseNPAL()
{
@ -692,7 +702,7 @@ void SmushPlayer::parseFRME()
parseXPAL();
break;
case 'IACT':
parseTRES();
parseIACT();
break;
case 'STOR':
case 'FTCH':

5
saveload.cpp
View file

@ -606,10 +606,9 @@ void Scumm::saveOrLoad(Serializer * s)
s->saveLoadArrayOf(actor, NUM_ACTORS, sizeof(actor[0]), actorEntries);
if (_current_version < VER_V9) {
printf("Loading pre-v9\n");
if (_current_version < VER_V9)
s->saveLoadArrayOf(vm.slot, 25, sizeof(vm.slot[0]), scriptSlotEntries);
} else
else
s->saveLoadArrayOf(vm.slot, NUM_SCRIPT_SLOT, sizeof(vm.slot[0]), scriptSlotEntries);
s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]),
objectEntries);

1
scummvm.cpp
View file

@ -892,7 +892,6 @@ void Scumm::processKbd()
_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
}
_mouseButStat = _lastKeyHit;
}

2
smush.h
View file

@ -82,7 +82,7 @@ struct SmushPlayer {
void parsePSAD();
void parseTRES();
void parseXPAL();
void parseIACT();
void fileRead(void *mem, int len);
uint32 nextBE32();

4
sound.cpp
View file

@ -722,8 +722,8 @@ void Scumm::decompressBundleSound(int index) {
switch(table[i].codec) {
case 0:
warning("Unimplemented bundle codec 1");
outputSize = 0;
outputSize = table[i].size;
memcpy(&CompOutput[0], &CompInput[0], outputSize);
break;
case 1: