]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Enhance fix details in show_tint entity
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 6 Jan 2022 23:46:54 +0000 (00:46 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 6 Jan 2022 23:46:54 +0000 (00:46 +0100)
qcsrc/common/mutators/mutator/nades/nades.qc

index e0666048f046002ae785ba5195212bc135cc60dd..f4eb49b614c9a1c0b63d3f89f25d2b4c2b3010bf 100644 (file)
@@ -591,7 +591,7 @@ void nade_entrap_touch(entity this, entity toucher)
 
        if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
        {
-               entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+               entity show_tint = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
                STAT(ENTRAP_ORB, show_tint) = time + 0.1;
 
                float tint_alpha = 0.75;
@@ -647,7 +647,7 @@ void nade_heal_touch(entity this, entity toucher)
 
        if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
        {
-               entity show_red = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+               entity show_red = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
                STAT(HEALING_ORB, show_red) = time+0.1;
                STAT(HEALING_ORB_ALPHA, show_red) = 0.75 * (this.ltime - time) / this.orb_lifetime;
        }
@@ -676,7 +676,7 @@ void nade_veil_touch(entity this, entity toucher)
 {
        if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
        {
-               entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+               entity show_tint = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
 
                float tint_alpha = 0.75;
                if(SAME_TEAM(toucher, this.realowner))