From 081cf814b0373e10e6836db1fbe6ba6bf320493f Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Fri, 24 Jan 2020 11:57:01 +0200
Subject: [PATCH] - fixed wrong arguments of a few A_StartSound() calls
https://forum.zdoom.org/viewtopic.php?t=67074
---
wadsrc/static/zscript/actors/inventory/powerups.zs | 8 ++++----
wadsrc/static/zscript/actors/strife/inquisitor.zs | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs
index 6c3569a365..307bfd411c 100644
--- a/wadsrc/static/zscript/actors/inventory/powerups.zs
+++ b/wadsrc/static/zscript/actors/inventory/powerups.zs
@@ -1660,7 +1660,7 @@ class PowerDamage : Powerup
if (!passive && damage > 0)
{
newdamage = max(1, ApplyDamageFactors(GetClass(), damageType, damage, damage * 4));
- if (Owner != null && newdamage > damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, 1.0, false, ATTN_NONE);
+ if (Owner != null && newdamage > damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
}
}
}
@@ -1691,7 +1691,7 @@ class PowerProtection : Powerup
let o = Owner; // copy to a local variable for quicker access.
if (o != null)
{
- o.A_StartSound(SeeSound, CHAN_AUTO, 1.0, false, ATTN_NONE);
+ o.A_StartSound(SeeSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
// Transfer various protection flags if owner does not already have them.
// If the owner already has the flag, clear it from the powerup.
@@ -1731,7 +1731,7 @@ class PowerProtection : Powerup
let o = Owner; // copy to a local variable for quicker access.
if (o != null)
{
- o.A_StartSound(DeathSound, CHAN_AUTO, 1.0, false, ATTN_NONE);
+ o.A_StartSound(DeathSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
o.bNoRadiusDmg &= !bNoRadiusDmg;
o.bDontMorph &= !bDontMorph;
@@ -1754,7 +1754,7 @@ class PowerProtection : Powerup
if (passive && damage > 0)
{
newdamage = max(0, ApplyDamageFactors(GetClass(), damageType, damage, damage / 4));
- if (Owner != null && newdamage < damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, 1.0, false, ATTN_NONE);
+ if (Owner != null && newdamage < damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
}
}
}
diff --git a/wadsrc/static/zscript/actors/strife/inquisitor.zs b/wadsrc/static/zscript/actors/strife/inquisitor.zs
index f999e015f1..5ad81d0504 100644
--- a/wadsrc/static/zscript/actors/strife/inquisitor.zs
+++ b/wadsrc/static/zscript/actors/strife/inquisitor.zs
@@ -140,7 +140,7 @@ class Inquisitor : Actor
if (target == null)
return;
- A_StartSound ("inquisitor/jump", CHAN_ITEM, 1, true);
+ A_StartSound ("inquisitor/jump", CHAN_ITEM, CHANF_LOOPING);
AddZ(64);
A_FaceTarget ();
let localspeed = Speed * (2./3);