Skip to content

Commit

Permalink
- fixed wrong arguments of a few A_StartSound() calls
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-lysiuk committed Jan 24, 2020
1 parent 142e3c7 commit 081cf81
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions wadsrc/static/zscript/actors/inventory/powerups.zs
Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion wadsrc/static/zscript/actors/strife/inquisitor.zs
Expand Up @@ -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);
Expand Down

0 comments on commit 081cf81

Please sign in to comment.