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

added SFX support

Browse Source 
svn-id: r7574
This commit is contained in:
Robert Göffringmann 2003-05-16 15:33:18 +00:00
parent 914d886769
commit 50bbfe0372
8 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sky/intro.cpp
View File

@ -197,7 +197,8 @@ void SkyState::intro(void) {
_skyDisk->prefetchFile(60112); // revolution screen
_skyDisk->prefetchFile(60113); // revolution palette
_skyMusic->loadSectionMusic(0);
_skyMusic->loadSection(0);
_skySound->loadSection(0);
delay(3000); //keep virgin screen up for 3 seconds
CHECK_ESC
@ -475,12 +476,12 @@ void SkyState::removeText(uint32 *&cmdPtr) {
void SkyState::introFx(uint32 *&cmdPtr) {
warning("introFx() not implemented yet");
_skySound->playSound((uint16)cmdPtr[2], (uint16)cmdPtr[3]);
cmdPtr += 4;
}
void SkyState::introVol(uint32 *&cmdPtr) {
warning("introVol() not implemented yet");
_mixer->setVolume(((cmdPtr[2] & 0x7F) + 1) << 1);
cmdPtr += 3;
}

6
sky/logic.cpp
View File

@ -48,11 +48,12 @@ static const LogicTable logicTable[] = {
&SkyLogic::simpleAnim, // 16 Module anim without x,y's
};
SkyLogic::SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, uint32 gameVersion) {
SkyLogic::SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, SkySound *skySound, uint32 gameVersion) {
_skyDisk = skyDisk;
_skyGrid = skyGrid;
_skyText = skyText;
_skyMusic = skyMusic;
_skySound = skySound;
_skyMouse = skyMouse;
_gameVersion = gameVersion;
_skyAutoRoute = new SkyAutoRoute(_skyGrid);
@ -1552,7 +1553,8 @@ uint32 SkyLogic::fnEnterSection(uint32 sectionNo, uint32 b, uint32 c) {
_saveCurrentSection = sectionNo;
sectionNo++;
_skyMusic->loadSectionMusic((byte)sectionNo);
_skyMusic->loadSection((byte)sectionNo);
_skySound->loadSection((byte)sectionNo);
_skyGrid->loadGrids();
}

3
sky/logic.h
View File

@ -31,7 +31,7 @@
class SkyLogic {
public:
SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, uint32 gameVersion);
SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, SkySound *skySound, uint32 gameVersion);
void engine();
void lreturn();
@ -196,6 +196,7 @@ protected:
SkyGrid *_skyGrid;
SkyText *_skyText;
SkyMusicBase *_skyMusic;
SkySound *_skySound;
SkyAutoRoute *_skyAutoRoute;
SkyMouse *_skyMouse;
};

2
sky/musicbase.cpp
View File

@ -34,7 +34,7 @@ SkyMusicBase::~SkyMusicBase(void)
if (_musicData) free(_musicData);
}
void SkyMusicBase::loadSectionMusic(uint8 pSection)
void SkyMusicBase::loadSection(uint8 pSection)
{
if (_currentMusic) stopMusic();
if (_musicData) free(_musicData);

2
sky/musicbase.h
View File

@ -45,7 +45,7 @@ class SkyMusicBase {
public:
SkyMusicBase(SkyDisk *pSkyDisk);
virtual ~SkyMusicBase(void);
void loadSectionMusic(uint8 pSection);
void loadSection(uint8 pSection);
void musicCommand(uint16 command);
void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; }; // 4

4
sky/sky.cpp
View File

@ -106,8 +106,8 @@ void SkyState::initialise(void) {
//initialise_memory();
_skySound = new SkySound(_mixer);
_skyDisk = new SkyDisk(_gameDataPath);
_skySound = new SkySound(_mixer, _skyDisk);
if (_detector->getMidiDriverType() == MD_ADLIB) {
_skyMusic = new SkyAdlibMusic(_mixer, _skyDisk);
@ -127,7 +127,7 @@ void SkyState::initialise(void) {
//initialiseRouter();
loadFixedItems();
_skyGrid = new SkyGrid(_skyDisk);
_skyLogic = new SkyLogic(_skyDisk, _skyGrid, _skyText, _skyMusic, _skyMouse, _gameVersion);
_skyLogic = new SkyLogic(_skyDisk, _skyGrid, _skyText, _skyMusic, _skyMouse, _skySound, _gameVersion);
_timer = Engine::_timer; // initialize timer *after* _skyScreen has been initialized.
_timer->installProcedure(&timerHandler, 1000000 / 50); //call 50 times per second

56
sky/sound.cpp
View File

@ -23,11 +23,23 @@
#include "sky/sound.h"
#include "sky/struc.h"
SkySound::SkySound(SoundMixer *mixer) {
#define SOUND_FILE_BASE 60203
#define SFX_BASE 0xA60
SkySound::SkySound(SoundMixer *mixer, SkyDisk *pDisk) {
_skyDisk = pDisk;
_soundData = NULL;
_mixer = mixer;
_voiceHandle = 0;
_effectHandle = 0;
_bgSoundHandle = 0;
_ingameSound = 0;
}
SkySound::~SkySound(void) {
if (_ingameSound) _mixer->stop(_ingameSound - 1);
if (_soundData) free(_soundData);
}
int SkySound::playVoice(byte *sound, uint32 size) {
@ -52,3 +64,45 @@ int SkySound::playSound(byte *sound, uint32 size, PlayingSoundHandle *handle) {
return _mixer->playRaw(handle, buffer, size, 11025, flags);
}
void SkySound::loadSection(uint8 pSection) {
if (_ingameSound) _mixer->stop(_ingameSound - 1);
_ingameSound = 0;
if (_soundData) free(_soundData);
_soundData = _skyDisk->loadFile(pSection * 4 + SOUND_FILE_BASE, NULL);
_sampleRates = _soundData + 0xA4E;
_sfxInfo = _soundData + 0xA60;
}
void SkySound::playSound(uint16 sound, uint16 volume) {
if (!_soundData) {
warning("SkySound::playSound(%04X, %04X) called with a section having been loaded.\n", sound, volume);
return;
}
if (sound > 2) {
if (sound & 0x80) warning("SkySound::playSound(%04X, %04X) not implemented.\n", sound, volume);
else warning("SkySound::playSound(%04X, %04X) ignored.\n", sound, volume);
return ;
}
volume = ((volume & 0x7F) + 1) << 1;
sound &= 0xFF;
// note: all those tables are big endian. Don't ask me why. *sigh*
uint16 sampleRate = (_sampleRates[sound << 2] << 8) | _sampleRates[(sound << 2) | 1];
uint16 dataOfs = ((_sfxInfo[sound << 3] << 8) | _sfxInfo[(sound << 3) | 1]) << 4;
dataOfs += SFX_BASE;
uint16 dataSize = (_sfxInfo[(sound << 3) | 2] << 8) | _sfxInfo[(sound << 3) | 3];
uint16 dataLoop = (_sfxInfo[(sound << 3) | 6] << 8) | _sfxInfo[(sound << 3) | 7];
byte flags = SoundMixer::FLAG_UNSIGNED;
if (dataSize == dataLoop)
flags |= SoundMixer::FLAG_LOOP;
if (_ingameSound) _mixer->stop(_ingameSound - 1);
_mixer->setVolume(volume);
_mixer->playRaw(&_ingameSound, _soundData + dataOfs, dataSize, sampleRate, flags);
}

14
sky/sound.h
View File

@ -19,8 +19,9 @@
*
*/
#include "sound/mixer.h"
#include "sky/disk.h"
#include "common/engine.h"
class SkySound {
protected:
@ -31,15 +32,24 @@ public:
PlayingSoundHandle _voiceHandle;
PlayingSoundHandle _effectHandle;
PlayingSoundHandle _bgSoundHandle;
PlayingSoundHandle _ingameSound;
protected:
int playSound(byte *sound, uint32 size, PlayingSoundHandle *handle);
public:
SkySound(SoundMixer *mixer);
SkySound(SoundMixer *mixer, SkyDisk *pDisk);
~SkySound(void);
int playVoice(byte *sound, uint32 size);
int playBgSound(byte *sound, uint32 size);
void loadSection(uint8 pSection);
void playSound(uint16 sound, uint16 volume);
private:
SkyDisk *_skyDisk;
uint8 *_soundData;
uint8 *_sampleRates, *_sfxInfo;
};