From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 13 Oct 2013 16:09:57 +0000 (+0200)
Subject: Fix colormap loading, fixes #1558
X-Git-Tag: xonotic-v0.8.0~284
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7dc808e41d781a54181403cc9e5ccf66a8acaf41;p=xonotic%2Fxonotic-data.pk3dir.git

Fix colormap loading, fixes #1558
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index b2c98e4ed..3837ed4c9 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -180,7 +180,7 @@ void CSQCPlayer_ModelAppearance_Apply(float islocalplayer)
 	float isfriend;
 	float cm;
 	cm = self.forceplayermodels_savecolormap;
-	cm = (cm >= 1024) ? cm : (stof(getplayerkeyvalue(self.colormap - 1, "colors")) + 1024);
+	cm = (cm >= 1024) ? cm : (stof(getplayerkeyvalue(cm - 1, "colors")) + 1024);
 
 	if(teamplay)
 		isfriend = (cm == 1024 + 17 * myteam);