X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcsqcmodel_settings.qh;h=c53a19d04e3e87f6b0662fec9ae4e42b86cc5b4b;hb=2c20e3699828b698074c825401dfe21ee0d9fe27;hp=bdeab298ebe9172fb6239359afef528a3342ef24;hpb=70dbd52151c76d8300738a163ed92768ad606b15;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index bdeab298e..c53a19d04 100644
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -1,9 +1,12 @@
 // define this if svqc code wants to use .frame2 and .lerpfrac
-#define CSQCMODEL_HAVE_TWO_FRAMES
+//#define CSQCMODEL_HAVE_TWO_FRAMES
 
 // don't define this ever
 //#define CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW
 
+// server decides crouching, this lags, but so be it
+#define CSQCMODEL_SERVERSIDE_CROUCH
+
 // a hack for Xonotic
 #ifdef CSQC
 # define TAG_ENTITY_NAME tag_networkentity
@@ -14,6 +17,9 @@
 # define TAG_ENTITY_TYPE entity
 #endif
 
+// new fields
+.vector v_angle;
+
 // add properties you want networked to CSQC here
 #define CSQCMODEL_EXTRAPROPERTIES \
 	CSQCMODEL_PROPERTY(1, float, ReadShort, WriteShort, colormap) \
@@ -22,12 +28,25 @@
 	CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 254, -1, 254) \
 	CSQCMODEL_PROPERTY(16, float, ReadByte, WriteByte, skin) \
 	CSQCMODEL_PROPERTY(32, float, ReadApproxPastTime, WriteApproxPastTime, death_time) \
+	CSQCMODEL_PROPERTY(64, float, ReadByte, WriteByte, solid) \
 	CSQCMODEL_IF(!isplayer) \
-		CSQCMODEL_PROPERTY(64, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \
-		CSQCMODEL_PROPERTY_SCALED(128, float, ReadByte, WriteByte, glowmod_x, 255, 0, 255) \
-		CSQCMODEL_PROPERTY_SCALED(128, float, ReadByte, WriteByte, glowmod_y, 255, 0, 255) \
-		CSQCMODEL_PROPERTY_SCALED(128, float, ReadByte, WriteByte, glowmod_z, 255, 0, 255) \
-	CSQCMODEL_ENDIF
+		CSQCMODEL_PROPERTY(128, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \
+		CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_x, 255, 0, 255) \
+		CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_y, 255, 0, 255) \
+		CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_z, 255, 0, 255) \
+	CSQCMODEL_ENDIF \
+	CSQCMODEL_IF(isplayer) \
+		CSQCMODEL_PROPERTY(128, float, ReadByte, WriteByte, anim_state) \
+		CSQCMODEL_PROPERTY(128, float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \
+		CSQCMODEL_IF(!islocalplayer) \
+			CSQCMODEL_PROPERTY(256, float, ReadChar, WriteChar, anim_lower_action) \
+			CSQCMODEL_PROPERTY(256, float, ReadApproxPastTime, WriteApproxPastTime, anim_lower_time) \
+		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_PROPERTY_SCALED(4096, float, ReadShort, WriteShort, scale, 256, 0, 99999999)
 // 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
 
 // add hook function calls here
@@ -36,7 +55,7 @@
 #define CSQCMODEL_HOOK_POSTUPDATE \
 	CSQCModel_Hook_PostUpdate(isnew, isplayer, islocalplayer);
 #define CSQCMODEL_HOOK_PREDRAW \
-	CSQCModel_Hook_PreDraw();
+	CSQCModel_Hook_PreDraw(isplayer);
 #define CSQCPLAYER_HOOK_POSTCAMERASETUP
 
 // force updates of player entities that often even if unchanged
@@ -51,34 +70,8 @@
 //vector PL_CROUCH_VIEW_OFS  = ...;
 
 #ifdef SVQC
-# ifdef NO_LEGACY_NETWORKING
-#  define CSQCMODEL_AUTOINIT() CSQCModel_LinkEntity()
-#  define CSQCMODEL_AUTOUPDATE() CSQCModel_CheckUpdate()
-# else
-.float iscsqcmodel;
-float autocvar_sv_use_csqc_players;
-#  define CSQCMODEL_AUTOINIT() \
-	if(autocvar_sv_use_csqc_players) \
-	{ \
-		CSQCModel_LinkEntity(); \
-		self.iscsqcmodel = 1; \
-	} \
-	else \
-		self.iscsqcmodel = 0
-#  define CSQCMODEL_AUTOUPDATE() \
-	if(autocvar_sv_use_csqc_players && !self.iscsqcmodel) \
-	{ \
-		CSQCModel_LinkEntity(); \
-		self.iscsqcmodel = 1; \
-	} \
-	if(!autocvar_sv_use_csqc_players && self.iscsqcmodel) \
-	{ \
-		CSQCModel_UnlinkEntity(); \
-		self.iscsqcmodel = 0; \
-	} \
-	if(self.iscsqcmodel) \
-		CSQCModel_CheckUpdate()
-# endif
+# define CSQCMODEL_AUTOINIT() CSQCModel_LinkEntity()
+# define CSQCMODEL_AUTOUPDATE() CSQCModel_CheckUpdate()
 #endif
 
 #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE