From 15df231a95b72e17ada92d1bed77a480bc01b4d9 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Wed, 7 Jun 2017 17:45:22 -0500 Subject: [PATCH 1/4] - Fixed: Vel3DFromAngle's internal function call had the pitch and angle parameters backwards: --- src/p_mobj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 43d522213..14d365b61 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -8137,7 +8137,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; } From 8c053c0141872c2dfbef1807b47e3e89562abdbd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 Jun 2017 09:00:03 +0200 Subject: [PATCH 2/4] - let P_CheckMissileSpawn also clear MF2_PCROSS before checking the move. --- src/p_mobj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 14d365b61..8d8655d61 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -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 From 68e17eb0c642019475358c35e76d7e3b5228f359 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 Jun 2017 16:23:35 +0200 Subject: [PATCH 3/4] Create alienspectres.txt fixed attenuation for Strife's 'killed a spectre' message. --- wadsrc/static/zscript/strife/alienspectres.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/strife/alienspectres.txt b/wadsrc/static/zscript/strife/alienspectres.txt index d17d91eb2..726c8a05e 100644 --- a/wadsrc/static/zscript/strife/alienspectres.txt +++ b/wadsrc/static/zscript/strife/alienspectres.txt @@ -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); } } From 6b3093d7add2d1bff87e09ed5d53ebca4ce0207c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 Jun 2017 17:13:36 +0200 Subject: [PATCH 4/4] Another sound with wrong attenuation --- wadsrc/static/zscript/strife/acolyte.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/strife/acolyte.txt b/wadsrc/static/zscript/strife/acolyte.txt index c14cb5bf7..f7457dd56 100644 --- a/wadsrc/static/zscript/strife/acolyte.txt +++ b/wadsrc/static/zscript/strife/acolyte.txt @@ -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); } } }