zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed wrong arguments of a few A_StartSound() calls

Browse source 
https://forum.zdoom.org/viewtopic.php?t=67074
This commit is contained in:
alexey.lysiuk 2020-01-24 11:57:01 +02:00
parent 142e3c7df7
commit 081cf814b0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wadsrc/static/zscript/actors/inventory/powerups.zs
View file

@ -1660,7 +1660,7 @@ class PowerDamage : Powerup
if (!passive && damage > 0) if (!passive && damage > 0)
{ {
newdamage = max(1, ApplyDamageFactors(GetClass(), damageType, damage, damage * 4)); 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. let o = Owner; // copy to a local variable for quicker access.
if (o != null) 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. // Transfer various protection flags if owner does not already have them.
// If the owner already has the flag, clear it from the powerup. // 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. let o = Owner; // copy to a local variable for quicker access.
if (o != null) 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.bNoRadiusDmg &= !bNoRadiusDmg;
o.bDontMorph &= !bDontMorph; o.bDontMorph &= !bDontMorph;
@ -1754,7 +1754,7 @@ class PowerProtection : Powerup
if (passive && damage > 0) if (passive && damage > 0)
{ {
newdamage = max(0, ApplyDamageFactors(GetClass(), damageType, damage, damage / 4)); 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);
} }
} }
} }

2
wadsrc/static/zscript/actors/strife/inquisitor.zs
View file

@ -140,7 +140,7 @@ class Inquisitor : Actor
if (target == null) if (target == null)
return; return;
A_StartSound ("inquisitor/jump", CHAN_ITEM, 1, true); A_StartSound ("inquisitor/jump", CHAN_ITEM, CHANF_LOOPING);
AddZ(64); AddZ(64);
A_FaceTarget (); A_FaceTarget ();
let localspeed = Speed * (2./3); let localspeed = Speed * (2./3);