]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Viewmodels: call wr_glow on activeweapon, not switchingweapon 250/head
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 30 Nov 2015 05:56:50 +0000 (16:56 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 30 Nov 2015 05:56:50 +0000 (16:56 +1100)
qcsrc/client/view.qc

index 6a6214a98a15d629105c9a4f6296b7947e73544e..4714919b958df7e5252898751d9c86c1312ce814 100644 (file)
@@ -276,7 +276,7 @@ void viewmodel_draw(entity this)
        float a = this.alpha;
        int c = stof(getplayerkeyvalue(current_player, "colors"));
        vector g;
-       Weapon wep = Weapons_from(switchingweapon);
+       Weapon wep = Weapons_from(activeweapon);
        if (!(g = wep.wr_glow(wep))) g = colormapPaletteColor(c & 0x0F, true) * 2;
        entity me = CSQCModel_server2csqc(player_localentnum - 1);
        int fx = ((me.csqcmodel_effects & EFMASK_CHEAP)