OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed xlat_parser.h from the repository. Lemon was always being run on

Browse source 
xlat_parser.y because both files had the same time stamp after an update,
  and Lemon only rewrites the header file if it's changed.
- Added $volume SNDINFO command. This is multiplied with the volume the sound
  is played at to arrive at the final volume (before distance attenuation).
- Added the CHAN_AREA flag to disable 3D panning within the min distance of a
  sound. Sector sound sequences (except doors) use this flag.
- Added the CHAN_LOOP flag to replace the S_Looped* sound functions.
- Restored the sound limiting.


SVN r849 (trunk)
This commit is contained in:
Randy Heit 2008-03-25 04:42:26 +00:00
commit aef34f9aa5
24 changed files with 510 additions and 430 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/s_advsound.cpp
View file

@ -147,6 +147,7 @@ enum SICommands
SI_IfHexen,
SI_IfStrife,
SI_Rolloff,
SI_Volume,
};
// Blood was a cool game. If Monolith ever releases the source for it,
@ -186,7 +187,7 @@ MidiDeviceMap MidiDevices;
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
void S_StartNamedSound (AActor *ent, fixed_t *pt, int channel,
const char *name, float volume, float attenuation, bool looping);
const char *name, float volume, float attenuation);
extern bool IsFloat (const char *str);
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@ -242,6 +243,7 @@ static const char *SICommandStrings[] =
"$ifhexen",
"$ifstrife",
"$rolloff",
"$volume",
NULL
};
@ -440,8 +442,9 @@ int S_AddSoundLump (const char *logicalname, int lump)
newsfx.lumpnum = lump;
newsfx.next = 0;
newsfx.index = 0;
newsfx.frequency = 0;
newsfx.Volume = 1;
newsfx.PitchMask = CurrentPitchMask;
newsfx.NearLimit = 2;
newsfx.bRandomHeader = false;
newsfx.bPlayerReserve = false;
newsfx.bForce11025 = false;
@ -1105,12 +1108,13 @@ static void S_AddSNDINFO (int lump)
break;
case SI_Limit: {
// $limit <logical name> <max channels> -- deprecated and ignored
// $limit <logical name> <max channels>
int sfx;
sc.MustGetString ();
sfx = S_FindSoundTentative (sc.String);
sc.MustGetNumber ();
S_sfx[sfx].NearLimit = MIN(MAX(sc.Number, 0), 255);
}
break;
@ -1141,6 +1145,17 @@ static void S_AddSNDINFO (int lump)
CurrentPitchMask = (1 << clamp (sc.Number, 0, 7)) - 1;
break;
case SI_Volume: {
// $volume <logical name> <volume>
int sfx;
sc.MustGetString();
sfx = S_FindSoundTentative(sc.String);
sc.MustGetFloat();
S_sfx[sfx].Volume = sc.Float;
}
break;
case SI_Rolloff: {
// $rolloff *|<logical name> [linear|log|custom] <min dist> <max dist/rolloff factor>
// Using * for the name makes it the default for sounds that don't specify otherwise.
@ -1867,8 +1882,8 @@ void AAmbientSound::Tick ()
if (ambient->sound[0])
{
S_StartNamedSound (this, NULL, CHAN_BODY, ambient->sound,
ambient->volume, ambient->attenuation, true);
S_StartNamedSound (this, NULL, CHAN_BODY|CHAN_LOOP, ambient->sound,
ambient->volume, ambient->attenuation);
SetTicker (ambient);
}
else
@ -1881,7 +1896,7 @@ void AAmbientSound::Tick ()
if (ambient->sound[0])
{
S_StartNamedSound (this, NULL, CHAN_BODY, ambient->sound,
ambient->volume, ambient->attenuation, false);
ambient->volume, ambient->attenuation);
SetTicker (ambient);
}
else