X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcsqcmodel_settings.qh;fp=qcsrc%2Fcommon%2Fcsqcmodel_settings.qh;h=12c367b2f5f1ce4ba6267abcb53812169d8d1ef9;hb=cf41044c9d897080866da6e0ca39d807e094e23e;hp=125ef6bf36c99bf5d25a281e88c2053113109a91;hpb=43e59796e138c96dda6663007654bfe9496e391f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index 125ef6bf3..12c367b2f 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -1,29 +1,29 @@ #pragma once // 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 +// #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 -# define TAG_ENTITY_NAME tag_networkentity -# define TAG_ENTITY_TYPE float +#define TAG_ENTITY_NAME tag_networkentity +#define TAG_ENTITY_TYPE float .float tag_networkentity; -# define TAG_VIEWLOC_NAME tag_networkviewloc -# define TAG_VIEWLOC_TYPE int +#define TAG_VIEWLOC_NAME tag_networkviewloc +#define TAG_VIEWLOC_TYPE int .float tag_networkviewloc; #else -# define TAG_ENTITY_NAME tag_entity -# define TAG_ENTITY_TYPE entity +#define TAG_ENTITY_NAME tag_entity +#define TAG_ENTITY_TYPE entity -# define TAG_VIEWLOC_NAME viewloc -# define TAG_VIEWLOC_TYPE entity +#define TAG_VIEWLOC_NAME viewloc +#define TAG_VIEWLOC_TYPE entity #endif // add properties you want networked to CSQC here @@ -36,23 +36,23 @@ CSQCMODEL_PROPERTY(BIT(5), float, ReadApproxPastTime, WriteApproxPastTime, death_time) \ CSQCMODEL_PROPERTY(BIT(6), float, ReadByte, WriteByte, solid) \ CSQCMODEL_IF(!isplayer) \ - CSQCMODEL_PROPERTY(BIT(7), TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_x, 254, -1, 254) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_y, 254, -1, 254) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_z, 254, -1, 254) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_x, 254, -1, 254) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_y, 254, -1, 254) \ - CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_z, 254, -1, 254) \ + CSQCMODEL_PROPERTY(BIT(7), TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_x, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_y, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_z, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_x, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_y, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_z, 254, -1, 254) \ CSQCMODEL_ENDIF \ CSQCMODEL_IF(isplayer) \ - CSQCMODEL_PROPERTY(BIT(7), int, ReadByte, WriteByte, anim_state) \ - CSQCMODEL_PROPERTY(BIT(7), float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \ - CSQCMODEL_IF(!islocalplayer) \ - CSQCMODEL_PROPERTY(BIT(8), float, ReadChar, WriteChar, anim_lower_action) \ - CSQCMODEL_PROPERTY(BIT(8), float, ReadApproxPastTime, WriteApproxPastTime, anim_lower_time) \ - CSQCMODEL_ENDIF \ - CSQCMODEL_PROPERTY(BIT(9), float, ReadChar, WriteChar, anim_upper_action) \ - CSQCMODEL_PROPERTY(BIT(9), float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \ + CSQCMODEL_PROPERTY(BIT(7), int, ReadByte, WriteByte, anim_state) \ + CSQCMODEL_PROPERTY(BIT(7), float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \ + CSQCMODEL_IF(!islocalplayer) \ + CSQCMODEL_PROPERTY(BIT(8), float, ReadChar, WriteChar, anim_lower_action) \ + CSQCMODEL_PROPERTY(BIT(8), float, ReadApproxPastTime, WriteApproxPastTime, anim_lower_time) \ + CSQCMODEL_ENDIF \ + CSQCMODEL_PROPERTY(BIT(9), float, ReadChar, WriteChar, anim_upper_action) \ + CSQCMODEL_PROPERTY(BIT(9), float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \ CSQCMODEL_ENDIF \ CSQCMODEL_PROPERTY(BIT(10), float, ReadAngle, WriteAngle, v_angle_x) \ CSQCMODEL_PROPERTY(BIT(11), int, ReadByte, WriteByte, traileffect) \ @@ -73,16 +73,16 @@ #endif // mod must define: -//vector PL_MIN = ...; -//vector PL_MAX = ...; -//vector PL_VIEW_OFS = ...; -//vector PL_CROUCH_MIN = ...; -//vector PL_CROUCH_MAX = ...; -//vector PL_CROUCH_VIEW_OFS = ...; +// vector PL_MIN = ...; +// vector PL_MAX = ...; +// vector PL_VIEW_OFS = ...; +// vector PL_CROUCH_MIN = ...; +// vector PL_CROUCH_MAX = ...; +// vector PL_CROUCH_VIEW_OFS = ...; #ifdef SVQC -# define CSQCMODEL_AUTOINIT(e) CSQCModel_LinkEntity(e) -# define CSQCMODEL_AUTOUPDATE(e) CSQCModel_CheckUpdate(e) +#define CSQCMODEL_AUTOINIT(e) CSQCModel_LinkEntity(e) +#define CSQCMODEL_AUTOUPDATE(e) CSQCModel_CheckUpdate(e) #endif #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE