]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use a safer formula to skip empty bones
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 12:17:14 +0000 (14:17 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 12:17:14 +0000 (14:17 +0200)
qcsrc/client/damage.qc

index a0682eef1d66ca4be8232cb2f1e34bbcb479079c..7033447342187528d258a549bbadcfb9af149176 100644 (file)
@@ -49,12 +49,12 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
        // if there's no skeleton, object origin will automatically be selected
        FOR_EACH_TAG(self)
        {
+               if(!tagnum)
+                       continue; // skip empty bones
                // blacklist bones positioned outside the mesh, or the effect will be floating
                // TODO: Do we have to do it this way? Why do these bones exist at all?
                if(gettaginfo_name == "master" || gettaginfo_name == "knee_L" || gettaginfo_name == "knee_R" || gettaginfo_name == "leg_L" || gettaginfo_name == "leg_R")
                        continue; // player model bone blacklist
-               if(gettaginfo_name == "")
-                       continue; // skip empty bones
 
                // now choose the bone closest to impact origin
                if(vlen(hitorg - gettaginfo(self, tagnum)) <= vlen(hitorg - gettaginfo(self, nearestbone)))