This commit is contained in:
parent
00cdd7a011
commit
19ef8f78b7
@ -32,6 +32,10 @@ adjust channels ( watery-mario64 style music changes )
|
|||||||
#include "utils\utils.h"
|
#include "utils\utils.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __SOUND_SPU_H__
|
||||||
|
#include "sound\spu.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Std Lib
|
/* Std Lib
|
||||||
------- */
|
------- */
|
||||||
@ -282,7 +286,28 @@ static SFXDETAILS s_sfxDetails[CSoundMediator::NUM_SFXIDS]=
|
|||||||
{ 1, 121, 0 }, // SFX_CAR_START
|
{ 1, 121, 0 }, // SFX_CAR_START
|
||||||
{ 1, 122, 0 }, // CAR_SLOW_DOWN
|
{ 1, 122, 0 }, // CAR_SLOW_DOWN
|
||||||
{ 1, 123, 0 }, // SFX_SPONGEBOB_OUCH
|
{ 1, 123, 0 }, // SFX_SPONGEBOB_OUCH
|
||||||
|
{ 3, 124, 0 }, // SFX_DOGFISH_LASER*
|
||||||
|
{ 1, 125, 0 }, // SFX_DOGFISH_GROWL
|
||||||
|
{ 3, 126, 0 }, // SFX_DOGFISH_STOMP*
|
||||||
|
{ 1, 127, 0 }, // SFX_DOGFISH_THUMP
|
||||||
|
{ 3, 128, 0 }, // SFX_FLAME*
|
||||||
|
{ 3, 129, 0 }, // SFX_BOSS_JELLYFISH_MOVE*
|
||||||
|
{ 1, 130, 0 }, // SFX_BOSS_JELLYFISH_PULSATE
|
||||||
|
{ 3, 131, 0 }, // SFX_BOSS_JELLYFISH_ELECTRIC_SHOCK*
|
||||||
|
{ 1, 132, 0 }, // SFX_BOSS_JELLYFISH___SB_GETS_ELECTROCUTED
|
||||||
|
{ 1, 133, 0 }, // SFX_NEW_JELLY_LAUNCHER
|
||||||
|
{ 1, 134, 0 }, // SFX_NEW_LIFT
|
||||||
|
{ 1, 135, 0 }, // SFX_NEW_RUBBER_RING_BOUNCE
|
||||||
|
{ 1, 136, 0 }, // SFX_NEW_HIT_SWITCH
|
||||||
|
{ 1, 137, 0 }, // SFX_NEW_BOUNCE_TYRES
|
||||||
|
{ 1, 138, 0 }, // SFX_SHARK___CHOMP
|
||||||
|
{ 1, 139, 0 }, // SFX_SHARK___SWIM
|
||||||
|
{ 1, 140, 0 }, // SFX_SHARK___CREAKING_ATTACK_SOUND
|
||||||
|
{ 1, 141, 0 }, // SFX_SIREN
|
||||||
|
{ 1, 142, 0 }, // SFX_WORM___CHOMP
|
||||||
|
{ 1, 143, 0 }, // SFX_WORM___HISS
|
||||||
|
{ 1, 144, 0 }, // SFX_WORM___SWIM
|
||||||
|
{ 3, 145, 0 }, // SFX_FLYING_DUTCHMAN*
|
||||||
};
|
};
|
||||||
|
|
||||||
// Reverb details
|
// Reverb details
|
||||||
@ -430,8 +455,18 @@ if(_frames==0)_frames=1;
|
|||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
void CSoundMediator::setReverbType(REVERBTYPE _type)
|
void CSoundMediator::setReverbType(REVERBTYPE _type)
|
||||||
{
|
{
|
||||||
s_spuSound->setReverbDetails(&s_reverbDetails[_type]);
|
ReverbDetails *rev;
|
||||||
s_spuSound->setReverbActive(true);
|
|
||||||
|
rev=&s_reverbDetails[_type];
|
||||||
|
s_spuSound->setReverbDetails(rev);
|
||||||
|
if(rev->m_type==SPU_REV_MODE_OFF)
|
||||||
|
{
|
||||||
|
s_spuSound->setReverbActive(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
s_spuSound->setReverbActive(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,12 +22,6 @@
|
|||||||
#include "sound\xmplay.h"
|
#include "sound\xmplay.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __SOUND_SPU_H__
|
|
||||||
#include "sound\spu.h"
|
|
||||||
#endif
|
|
||||||
#ifndef __SOUND_XMPLAY_H__
|
|
||||||
#include "sound\xmplay.h"
|
|
||||||
#endif
|
|
||||||
#ifndef __CDXAHeader__
|
#ifndef __CDXAHeader__
|
||||||
#include "sound\cdxa.h"
|
#include "sound\cdxa.h"
|
||||||
#endif
|
#endif
|
||||||
@ -150,6 +144,18 @@ public:
|
|||||||
SFX_CLAM_SNAP,
|
SFX_CLAM_SNAP,
|
||||||
SFX_CAR_START, SFX_CAR_SLOW_DOWN,
|
SFX_CAR_START, SFX_CAR_SLOW_DOWN,
|
||||||
SFX_SPONGEBOB_OUCH,
|
SFX_SPONGEBOB_OUCH,
|
||||||
|
SFX_DOGFISH_LASER, SFX_DOGFISH_GROWL, SFX_DOGFISH_STOMP, SFX_DOGFISH_THUMP,
|
||||||
|
SFX_FLAME,
|
||||||
|
SFX_BOSS_JELLYFISH_MOVE, SFX_BOSS_JELLYFISH_PULSATE, SFX_BOSS_JELLYFISH_ELECTRIC_SHOCK, SFX_BOSS_JELLYFISH___SB_GETS_ELECTROCUTED,
|
||||||
|
SFX_NEW_JELLY_LAUNCHER,
|
||||||
|
SFX_NEW_LIFT,
|
||||||
|
SFX_NEW_RUBBER_RING_BOUNCE,
|
||||||
|
SFX_NEW_HIT_SWITCH,
|
||||||
|
SFX_NEW_BOUNCE_TYRES,
|
||||||
|
SFX_SHARK___CHOMP, SFX_SHARK___SWIM, SFX_SHARK___CREAKING_ATTACK_SOUND,
|
||||||
|
SFX_SIREN,
|
||||||
|
SFX_WORM___CHOMP, SFX_WORM___HISS, SFX_WORM___SWIM,
|
||||||
|
SFX_FLYING_DUTCHMAN,
|
||||||
|
|
||||||
NUM_SFXIDS
|
NUM_SFXIDS
|
||||||
};
|
};
|
||||||
|
@ -60,8 +60,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
MAX_SOUND_BANKS=4,
|
MAX_SPU_MANAGEMENT=200, // Number of samples that can be loaded..
|
||||||
MAX_SPU_MANAGEMENT=MAX_SOUND_BANKS+110,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static char s_spuManagementTable[];
|
static char s_spuManagementTable[];
|
||||||
|
@ -89,8 +89,8 @@ public:
|
|||||||
private:
|
private:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
MAX_XM_SONGS=5, // How many mods our internal loader copes with
|
MAX_XM_SONGS=2, // How many mods our internal loader copes with
|
||||||
MAX_XM_VABS=5, // How many vabs our internal loader copes with
|
MAX_XM_VABS=2, // How many vabs our internal loader copes with
|
||||||
|
|
||||||
MAX_SONG_HEADERS=24, // Number of mods that xmplay can play at once
|
MAX_SONG_HEADERS=24, // Number of mods that xmplay can play at once
|
||||||
MAX_XM_HEADERS=MAX_XM_SONGS, // Number of mods that xmplay can load at once
|
MAX_XM_HEADERS=MAX_XM_SONGS, // Number of mods that xmplay can load at once
|
||||||
|
Loading…
Reference in New Issue
Block a user