]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix damagetext and make shockwave initial shot origin use antilag (for accuracy)
authorMario <mario@smbclan.net>
Sun, 24 Jul 2016 20:43:26 +0000 (06:43 +1000)
committerMario <mario@smbclan.net>
Sun, 24 Jul 2016 20:43:41 +0000 (06:43 +1000)
qcsrc/common/mutators/mutator/damagetext/damagetext.qc
qcsrc/common/weapons/weapon/shockwave.qc

index 3cca0d9d113b6a44aa385658f87d760f6123c6e2..4694bcbf7305b7c6ba3674196e865fbefb0810ef 100644 (file)
@@ -150,7 +150,7 @@ NET_HANDLE(damagetext, bool isNew)
                 }
             }
         }
-        NEW(DamageText, group, location, health, armor, deathtype, friendlyfire);
+        make_impure(NEW(DamageText, group, location, health, armor, deathtype, friendlyfire));
     }
 }
 #endif
index 80adb45da6082cc40a21786d90986511ee95001a..499453ecd6f63d71b81760073bcbc6b1712ebe15 100644 (file)
@@ -366,7 +366,7 @@ void W_Shockwave_Attack(entity actor)
        float i, queue = 0;
 
        // set up the shot direction
-       W_SetupShot(actor, false, 3, SND_LASERGUN_FIRE, CH_WEAPON_B, WEP_CVAR(shockwave, blast_damage));
+       W_SetupShot(actor, true, 3, SND_LASERGUN_FIRE, CH_WEAPON_B, WEP_CVAR(shockwave, blast_damage));
        vector attack_endpos = (w_shotorg + (w_shotdir * WEP_CVAR(shockwave, blast_distance)));
        WarpZone_TraceLine(w_shotorg, attack_endpos, MOVE_NOMONSTERS, actor);
        vector attack_hitpos = trace_endpos;