final weapon fixes... for now

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 57df75faabf1c67c2c7e79a292d6512603e0f17f..bb716617a94843ed498532cf2536cdf065c1443c 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -9,7 +9,13 @@
 void CSQCModel_Hook_PreDraw(float isplayer)
 {
        // auto glowmod from colormap
-       self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? (self.colormap & 0xFF) : stof(getplayerkeyvalue(self.entnum - 1, "colors"))), TRUE) * 2;
+       if(isplayer)
+       {
+               if(self.colormap > 0)
+                       self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? (self.colormap & 0xFF) : stof(getplayerkeyvalue(self.colormap - 1, "colors"))), TRUE) * 2;
+               else
+                       self.glowmod = '1 1 1';
+       }
 
        if(self.modelindex != 0)
        {

diff --git a/qcsrc/csqcmodel/cl_player.qc b/qcsrc/csqcmodel/cl_player.qc
index 1a4911a9b0a5aed0f8cfc1f217d11933d22025ae..9adfb23d93ff970edb698b7e928a1d537ab0810a 100644 (file)
--- a/qcsrc/csqcmodel/cl_player.qc
+++ b/qcsrc/csqcmodel/cl_player.qc
@@ -211,7 +211,7 @@ void CSQCPlayer_SetCamera()
                }
                else
                        setproperty(VF_ORIGIN, self.origin + self.view_ofs);
-               self.angles_y = getproperty(VF_ANGLES_Y);
+               self.angles_y = input_angles_y;
 
                { CSQCPLAYER_HOOK_POSTCAMERASETUP }