From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 6 Mar 2012 18:24:40 +0000 (+0100)
Subject: fix two bugs regarding ok_model dir
X-Git-Tag: xonotic-v0.6.0~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca5f6a2c93ee4d96e4d928551900db11f4e8db1e;p=xonotic%2Fxonotic-data.pk3dir.git

fix two bugs regarding ok_model dir
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 2cda005ce..c2908766b 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -319,7 +319,7 @@ void CSQCModel_AutoTagIndex_Apply(void)
 							dprint("h_ model lacks weapon attachment, but v_ model is attached to it\n");
 						}
 					}
-					else
+					else if(self.tag_entity.isplayermodel)
 					{
 						self.tag_index = gettagindex(self.tag_entity, "weapon");
 						if(!self.tag_index)
@@ -517,7 +517,7 @@ void CSQCModel_Hook_PreUpdate(float isnew, float isplayer, float islocalplayer)
 void CSQCModel_Hook_PostUpdate(float isnew, float isplayer, float islocalplayer)
 {
 	// is it a player model? (shared state)
-	self.isplayermodel = (substring(self.model, 0, 14) == "models/player/");
+	self.isplayermodel = (substring(self.model, 0, 14) == "models/player/" || substring(self.model, 0, 17) == "models/ok_player/");
 
 	// save values set by server
 	if(self.isplayermodel)