]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
When picking up a powerup, don't keep playing the old pickup sound (hopefully fixes...
authorMario <mario@smbclan.net>
Tue, 29 Mar 2016 17:22:31 +0000 (03:22 +1000)
committerMario <mario@smbclan.net>
Tue, 29 Mar 2016 17:22:31 +0000 (03:22 +1000)
qcsrc/common/t_items.qc

index 87623da3630d62f7a98e1e20bea14cbf960accf6..85ba9f51b3471bac94a42f0d967f1dd7f2e7961b 100644 (file)
@@ -816,7 +816,7 @@ LABEL(pickup)
        other.last_pickup = time;
 
        Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(this), '0 0 0', 1);
-       _sound (other, CH_TRIGGER, (this.item_pickupsound ? this.item_pickupsound : Sound_fixpath(this.item_pickupsound_ent)), VOL_BASE, ATTEN_NORM);
+       _sound (other, (this.itemdef.instanceOfPowerup ? CH_TRIGGER_SINGLE : CH_TRIGGER), (this.item_pickupsound ? this.item_pickupsound : Sound_fixpath(this.item_pickupsound_ent)), VOL_BASE, ATTEN_NORM);
 
        if (this.classname == "droppedweapon")
                remove (this);