libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 13:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add sound effects code for Amiga and AtariST versions of Elvira 2.

Browse Source 
svn-id: r26989
This commit is contained in:
Travis Howell 2007-05-28 11:22:53 +00:00
parent 0d789e074e
commit 9d041cc059
6 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/agos/agos.h
View File

@ -571,6 +571,7 @@ protected:
void readGamePcFile(Common::SeekableReadStream *in);
void decompressData(const char *srcName, byte *dst, uint32 offset, uint32 srcSize, uint32 dstSize);
void loadOffsets(const char *filename, int number, uint32 &file, uint32 &offset, uint32 &compressedSize, uint32 &size);
void loadSound(uint sound);
void loadSound(uint sound, int pan, int vol, uint type);
void loadVoice(uint speechId);

32
engines/agos/res_snd.cpp
View File

@ -397,6 +397,38 @@ void AGOSEngine::loadSoundFile(const char* filename) {
_sound->playSfxData(dst, 0, 0, 0);
}
void AGOSEngine::loadSound(uint sound) {
byte *dst;
uint32 offs, size;
if (_curSfxFile == NULL)
return;
dst = _curSfxFile;
if (getGameType() == GType_WW) {
uint tmp = sound;
while (tmp--)
dst += READ_LE_UINT16(dst) + 4;
size = READ_LE_UINT16(dst);
offs = 4;
} else if (getGameType() == GType_ELVIRA2) {
while (READ_BE_UINT32(dst + 4) != sound)
dst += 12;
size = READ_BE_UINT32(dst);
offs = READ_BE_UINT32(dst + 8);
} else {
while (READ_BE_UINT16(dst + 6) != sound)
dst += 12;
size = READ_BE_UINT16(dst + 2);
offs = READ_BE_UINT32(dst + 8);
}
_sound->playRawData(dst + offs, sound, size);
}
void AGOSEngine::loadSound(uint sound, int pan, int vol, uint type) {
byte *dst;

8
engines/agos/script_e2.cpp
View File

@ -599,9 +599,11 @@ void AGOSEngine_Elvira2::oe2_ifExitLocked() {
}
void AGOSEngine_Elvira2::oe2_playEffect() {
// 174:
uint a = getVarOrWord();
debug(0, "oe2_playEffect: stub (%d)", a);
// 174: play sound
uint soundId = getVarOrWord();
loadSound(soundId);
debug(0, "oe2_playEffect: stub (%d)", soundId);
}
void AGOSEngine_Elvira2::oe2_getDollar2() {

33
engines/agos/vga.cpp
View File

@ -1072,37 +1072,14 @@ void AGOSEngine::vc27_resetSprite() {
}
void AGOSEngine::vc28_playSFX() {
byte *dst;
uint sound, channels, frequency, flags;
uint offs, size;
uint16 sound = vcReadNextWord();
uint16 channels = vcReadNextWord();
uint16 frequency = vcReadNextWord();
uint16 flags = vcReadNextWord();
sound = vcReadNextWord();
channels = vcReadNextWord();
frequency = vcReadNextWord();
flags = vcReadNextWord();
loadSound(sound);
debug(0, "vc28_playSFX: (%d, %d, %d, %d)", sound, channels, frequency, flags);
if (_curSfxFile == NULL)
return;
dst = _curSfxFile;
if (getGameType() == GType_WW) {
uint tmp = sound;
while (tmp--)
dst += READ_LE_UINT16(dst) + 4;
size = READ_LE_UINT16(dst);
offs = 4;
} else {
while (READ_BE_UINT16(dst + 6) != sound)
dst += 12;
size = READ_BE_UINT16(dst + 2);
offs = READ_BE_UINT32(dst + 8);
}
_sound->playRawData(dst + offs, sound, size);
}
void AGOSEngine::vc29_stopAllSounds() {

2
engines/agos/vga_e2.cpp
View File

@ -186,6 +186,8 @@ void AGOSEngine::vc52_playSound() {
_sound->playEffects(sound);
} else if (getGameId() == GID_SIMON1DOS) {
playSting(sound);
} else {
loadSound(sound);
}
}

10
engines/agos/zones.cpp
View File

@ -63,7 +63,15 @@ void AGOSEngine::loadZone(uint zoneNum) {
vpe->vgaFile1End = _blockEnd;
vpe->sfxFile = NULL;
if (!(getFeatures() & GF_ZLIBCOMP)) {
if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) &&
getGameType() == GType_ELVIRA2) {
// A singe sound file is used for Amiga and AtariST versions
if (loadVGASoundFile(1, 3)) {
vpe->sfxFile = _block;
vpe->sfxFileEnd = _blockEnd;
}
} else if (!(getFeatures() & GF_ZLIBCOMP)) {
if (loadVGASoundFile(zoneNum, 3)) {
vpe->sfxFile = _block;
vpe->sfxFileEnd = _blockEnd;