From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 2 Dec 2011 10:22:40 +0000 (+0100)
Subject: final weapon fixes... for now
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=674da7172864af1398ecf39cb555fd0c2e61387d;p=xonotic%2Fxonotic-data.pk3dir.git

final weapon fixes... for now
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 57df75faa..bb716617a 100644
--- 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 1a4911a9b..9adfb23d9 100644
--- 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 }