Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / vortex.qc

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 5c9ae23a1806d6b4b04801b61a16f8c8ea0c1534..72c6d75ffebf08c878ce6d20a592d5b4d85c7cd1 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -129,11 +129,16 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i
        impressive_hits = 0;
        FireRailgunBullet(actor, weaponentity, w_shotorg, w_shotorg + w_shotdir * max_shot_distance, mydmg, false, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, dtype);
 
-       if(yoda && flying)
-               Send_Notification(NOTIF_ONE, actor, MSG_ANNCE, ANNCE_ACHIEVEMENT_YODA);
+       if(yoda && flying) {
+               if(charge == 1) // play additional sound if we hit in the air with maximum damage
+                       sound(actor, CH_INFO, SND_MIDAIR, VOL_BASE, ATTN_NONE);
+               
+               Give_Medal(actor, YODA);
+       }
+       
        if(impressive_hits && actor.vortex_lasthit)
        {
-               Send_Notification(NOTIF_ONE, actor, MSG_ANNCE, ANNCE_ACHIEVEMENT_IMPRESSIVE);
+               Give_Medal(actor, IMPRESSIVE);
                impressive_hits = 0; // only every second time
        }