From: Mario <mario.mario@y7mail.com>
Date: Fri, 20 Dec 2013 18:02:41 +0000 (+1100)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~27
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4a33100bf6a3b684157c104c39fd47f4a810a735

Merge branch 'master' into Mario/monsters
---

4a33100bf6a3b684157c104c39fd47f4a810a735
diff --cc qcsrc/common/csqcmodel_settings.qh
index 8e794cc76a,cfe012275c..3f6dea7d11
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@@ -47,11 -47,8 +47,11 @@@
  		CSQCMODEL_ENDIF \
  		CSQCMODEL_PROPERTY(512, float, ReadChar, WriteChar, anim_upper_action) \
  		CSQCMODEL_PROPERTY(512, float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \
- 		CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \
  	CSQCMODEL_ENDIF \
 +	CSQCMODEL_IF(!isplayer) \
 +		CSQCMODEL_PROPERTY(2048, float, ReadByte, WriteByte, monsterid) \
 +	CSQCMODEL_ENDIF \
+ 	CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \
  	CSQCMODEL_PROPERTY_SCALED(4096, float, ReadByte, WriteByte, scale, 16, 0, 255)
  // TODO get rid of colormod/glowmod here, find good solution for nex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody