]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Name a float more correctly, doesn't change functionality
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 26 Feb 2012 21:13:16 +0000 (23:13 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 26 Feb 2012 21:13:16 +0000 (23:13 +0200)
qcsrc/client/damage.qc

index 00928ad627dd18dacc8e55c74c8dcf98bc690aa2..7785ebcbf82b597f06f5e1576b4a84127da7fdfd 100644 (file)
@@ -113,7 +113,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 
 void Ent_DamageInfo(float isNew)
 {
-       float dmg, rad, edge, thisdmg, forcemul, species, isplayer;
+       float dmg, rad, edge, thisdmg, forcemul, species, hitplayer;
        vector force, thisforce;
        entity oldself;
 
@@ -190,7 +190,7 @@ void Ent_DamageInfo(float isNew)
                DamageEffect(w_org, thisdmg, w_deathtype, species);
 
                if(self.isplayermodel)
-                       isplayer = TRUE; // this impact damaged a player
+                       hitplayer = TRUE; // this impact damaged a player
        }
 
        self = oldself;
@@ -328,7 +328,7 @@ void Ent_DamageInfo(float isNew)
        
        // TODO spawn particle effects and sounds based on w_deathtype
        if(!DEATH_ISSPECIAL(w_deathtype))
-       if not(isplayer && !rad) // don't show ground impacts for hitscan weapons if a player was hit
+       if not(hitplayer && !rad) // don't show ground impacts for hitscan weapons if a player was hit
        {
                float hitwep;