zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-06-09 05:57:10 -04:00
commit 63d9148604
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.cpp
View file

@ -6758,7 +6758,7 @@ bool P_CheckMissileSpawn (AActor* th, double maxdist)
// killough 3/15/98: no dropoff (really = don't care for missiles)
auto oldf2 = th->flags2;
th->flags2 &= ~MF2_MCROSS; // The following check is not supposed to activate missile triggers.
th->flags2 &= ~(MF2_MCROSS|MF2_PCROSS); // The following check is not supposed to activate missile triggers.
if (!(P_TryMove (th, newpos, false, NULL, tm, true)))
{
// [RH] Don't explode ripping missiles that spawn inside something
@ -8140,7 +8140,7 @@ DEFINE_ACTION_FUNCTION(AActor, Vel3DFromAngle)
PARAM_FLOAT(speed);
PARAM_ANGLE(angle);
PARAM_ANGLE(pitch);
self->Vel3DFromAngle(pitch, angle, speed);
self->Vel3DFromAngle(angle, pitch, speed);
return 0;
}

2
wadsrc/static/zscript/strife/acolyte.txt
View file

@ -103,7 +103,7 @@ class Acolyte : StrifeHumanoid
players[i].mo.GiveInventoryType ("QuestItem7");
players[i].SetLogNumber (14);
A_StopSound (CHAN_VOICE);
A_PlaySound ("svox/voc14", CHAN_VOICE);
A_PlaySound ("svox/voc14", CHAN_VOICE, 1, false, ATTN_NONE);
}
}
}

2
wadsrc/static/zscript/strife/alienspectres.txt
View file

@ -179,7 +179,7 @@ class AlienSpectre1 : SpectralMonster
if (log > 0)
{
String voc = "svox/voc" .. log;
A_PlaySound(voc, CHAN_VOICE);
A_PlaySound(voc, CHAN_VOICE, 1, false, ATTN_NONE);
player.player.SetLogNumber (log);
}
}