X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcsqcmodel_settings.qh;h=5e5ff42eb47e2893ca4699626fef5bfece9abe13;hb=9c09a961b8674e3a808889d3f34d71855018d3bc;hp=8e794cc76a39612198e1a32c09020dbc5d4cd03a;hpb=b56d8435ab6710d101761c6c2b9746e38e3cc813;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index 8e794cc76..5e5ff42eb 100644
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -1,3 +1,6 @@
+#ifndef CSQCMODEL_SETTINGS_H
+#define CSQCMODEL_SETTINGS_H
+
 // define this if svqc code wants to use .frame2 and .lerpfrac
 //#define CSQCMODEL_HAVE_TWO_FRAMES
 
@@ -5,7 +8,7 @@
 //#define CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW
 
 // server decides crouching, this lags, but so be it
-#define CSQCMODEL_SERVERSIDE_CROUCH
+//#define CSQCMODEL_SERVERSIDE_CROUCH
 
 // a hack for Xonotic
 #ifdef CSQC
@@ -22,11 +25,11 @@
 
 // add properties you want networked to CSQC here
 #define CSQCMODEL_EXTRAPROPERTIES \
-	CSQCMODEL_PROPERTY(1, float, ReadShort, WriteShort, colormap) \
-	CSQCMODEL_PROPERTY(2, float, ReadInt24_t, WriteInt24_t, effects) \
-	CSQCMODEL_PROPERTY(4, float, ReadByte, WriteByte, modelflags) \
+	CSQCMODEL_PROPERTY(1, int, ReadShort, WriteShort, colormap) \
+	CSQCMODEL_PROPERTY(2, int, ReadInt24_t, WriteInt24_t, effects) \
+	CSQCMODEL_PROPERTY(4, int, ReadByte, WriteByte, modelflags) \
 	CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 254, -1, 254) \
-	CSQCMODEL_PROPERTY(16, float, ReadByte, WriteByte, skin) \
+	CSQCMODEL_PROPERTY(16, int, ReadByte, WriteByte, skin) \
 	CSQCMODEL_PROPERTY(32, float, ReadApproxPastTime, WriteApproxPastTime, death_time) \
 	CSQCMODEL_PROPERTY(64, float, ReadByte, WriteByte, solid) \
 	CSQCMODEL_IF(!isplayer) \
@@ -39,7 +42,7 @@
 		CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, colormod_z, 255, 0, 255) \
 	CSQCMODEL_ENDIF \
 	CSQCMODEL_IF(isplayer) \
-		CSQCMODEL_PROPERTY(128, float, ReadByte, WriteByte, anim_state) \
+		CSQCMODEL_PROPERTY(128, int, ReadByte, WriteByte, anim_state) \
 		CSQCMODEL_PROPERTY(128, float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \
 		CSQCMODEL_IF(!islocalplayer) \
 			CSQCMODEL_PROPERTY(256, float, ReadChar, WriteChar, anim_lower_action) \
@@ -47,13 +50,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_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
+	CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \
+	CSQCMODEL_PROPERTY_SCALED(4096, float, ReadByte, WriteByte, scale, 16, 0, 255) \
+	CSQCMODEL_PROPERTY(8192, int, ReadInt24_t, WriteInt24_t, dphitcontentsmask)
+// TODO get rid of colormod/glowmod here, find good solution for vortex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody
 
 // add hook function calls here
 #define CSQCMODEL_HOOK_PREUPDATE \
@@ -81,3 +82,4 @@
 #endif
 
 #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE
+#endif