teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- stop the railgun's active sound if another weapon is selected.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-22 23:02:25 +02:00
parent ffbe275a4a
commit f53b348782
4 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/core/sound/s_sound.cpp
View file

@ -502,26 +502,9 @@ FSoundChan *SoundEngine::StartSound(int type, const void *source,
int seen = 0; int seen = 0;
if (source != NULL && channel == CHAN_AUTO) if (source != NULL && channel == CHAN_AUTO)
{ {
// Select a channel that isn't already playing something. // In the old sound system, 'AUTO' hijacked one of the other channels.
// Try channel 0 first, then travel from channel 7 down. // Now, with CHANF_OVERLAP at our disposal that isn't needed anymore. Just set the flag and let all sounds play on channel 0.
if (!IsChannelUsed(type, source, 0, &seen)) chanflags |= CHANF_OVERLAP;
{
channel = 0;
}
else
{
for (channel = 7; channel > 0; --channel)
{
if (!IsChannelUsed(type, source, channel, &seen))
{
break;
}
}
if (channel == 0)
{ // Crap. No free channels.
return NULL;
}
}
} }
// If this actor is already playing something on the selected channel, stop it. // If this actor is already playing something on the selected channel, stop it.

1
source/core/sound/s_soundinternal.h
View file

@ -184,6 +184,7 @@ struct FSoundChan : public FISoundChannel
// CHAN_ITEM is for small things and item pickup // CHAN_ITEM is for small things and item pickup
// CHAN_BODY is for generic body sounds // CHAN_BODY is for generic body sounds
// CHAN_PICKUP can optionally be set as a local sound only for "compatibility" // CHAN_PICKUP can optionally be set as a local sound only for "compatibility"
// Channels below 0 are reserved for CHAN_AUTO.
enum EChannel enum EChannel
{ {

7
source/sw/src/panel.cpp
View file

@ -982,11 +982,16 @@ int WeaponOperate(PLAYERp pp)
} }
// Shut that computer chick up if weapon has changed! // Shut that computer chick up if weapon has changed!
// This really should be handled better, but since there's no usable tracking state for the sounds, the easiest way to handle them is to play on otherwise unused channels.
if (pp->WpnRocketType != 2 || pp->CurWpn != pp->Wpn[WPN_MICRO]) if (pp->WpnRocketType != 2 || pp->CurWpn != pp->Wpn[WPN_MICRO])
{ {
pp->InitingNuke = FALSE; pp->InitingNuke = FALSE;
soundEngine->StopSound(SOURCE_Player, pp, CHAN_WEAPON); soundEngine->StopSound(SOURCE_Player, pp, CHAN_WEAPON);
} }
if (pp->CurWpn != pp->Wpn[WPN_RAIL])
{
soundEngine->StopSound(SOURCE_Player, pp, CHAN_ITEM);
}
return 0; return 0;
} }
@ -3718,7 +3723,7 @@ InitWeaponRail(PLAYERp pp)
pSetState(psp, psp->PresentState); pSetState(psp, psp->PresentState);
PlaySound(DIGI_RAIL_UP, pp, v3df_follow); PlaySound(DIGI_RAIL_UP, pp, v3df_follow);
PlaySound(DIGI_RAILREADY, pp, v3df_follow|v3df_dontpan); PlaySound(DIGI_RAILREADY, pp, v3df_follow | v3df_dontpan, CHAN_ITEM); // this one needs to be on a dedicated channel to allow switching it off without too many checks.
Set3DSoundOwner(psp->PlayerP->PlayerSprite); Set3DSoundOwner(psp->PlayerP->PlayerSprite);
FLAG_KEY_RELEASE(psp->PlayerP, SK_SHOOT); FLAG_KEY_RELEASE(psp->PlayerP, SK_SHOOT);

2
source/sw/src/sounds.cpp
View file

@ -945,7 +945,7 @@ SWBOOL PlaySong(const char* mapname, const char* song_file_name, int cdaudio_tra
} }
if (!Mus_Play(mapname, song_file_name, true)) if (!Mus_Play(mapname, song_file_name, true))
{ {
// try the CD track anyway if no MIDI could be found (the original game doesn't have any MIDI, it was CD Audio only, this avoids no music playing id mus_redbook is off.) // try the CD track anyway if no MIDI could be found (the original game doesn't have any MIDI, it was CD Audio only, this avoids no music playing if mus_redbook is off.)
FStringf trackname("track%02d.ogg", cdaudio_track); FStringf trackname("track%02d.ogg", cdaudio_track);
if (!Mus_Play(nullptr, trackname, true)) return false; if (!Mus_Play(nullptr, trackname, true)) return false;
} }