OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a StartConversation special that allows automatic activation of Strife

Browse source 
dialogs.
- Added Thing_Raise special that allows Arch-Vile like resurrections from scripts
  or DECORATE states.
- Added a RadiusDamageFactor property for actors. This replaces the hard coded
  factor of 0.25 for Hexen's players.
- Added new SpawnProjectile function to ACS. It's the same as Thing_Projectile2
  but the projectile is specified by name, not spawn ID.
- Added MAPINFO option to set the compatibility flags. If this is done these
  explicit settings will take precedence over the compatflags CVAR.

SVN r164 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-03 12:30:11 +00:00
commit 15681d0588
32 changed files with 473 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/s_sound.cpp
View file

@ -624,13 +624,13 @@ static void S_StartSound (fixed_t *pt, AActor *mover, int channel,
{
pt = NULL;
}
if (compatflags & COMPATF_MAGICSILENCE)
if (i_compatflags & COMPATF_MAGICSILENCE)
{ // For people who just can't play without a silent BFG.
channel = 1;
}
else
{
if ((channel & CHAN_MAYBE_LOCAL) && (compatflags & COMPATF_SILENTPICKUP))
if ((channel & CHAN_MAYBE_LOCAL) && (i_compatflags & COMPATF_SILENTPICKUP))
{
if (mover != 0 && mover != players[consoleplayer].camera)
{
@ -1108,7 +1108,7 @@ void S_StopSound (fixed_t *pt, int channel)
{
if (Channel[i].sfxinfo &&
((pt == NULL && Channel[i].pt == &Channel[i].x) || Channel[i].pt == pt) &&
((compatflags & COMPATF_MAGICSILENCE) || Channel[i].entchannel == channel))
((i_compatflags & COMPATF_MAGICSILENCE) || Channel[i].entchannel == channel))
{
S_StopChannel (i);
}
@ -1208,7 +1208,7 @@ bool S_IsActorPlayingSomething (AActor *actor, int channel)
{
int i;
if (compatflags & COMPATF_MAGICSILENCE)
if (i_compatflags & COMPATF_MAGICSILENCE)
{
channel = 0;
}