From 1723945a4deab7d57f4203bfbef551279dba03f8 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 2 Dec 2011 09:55:28 +0100 Subject: [PATCH] oops. My idea to network tag_entity was Doom'd, and Quake'd, and whatever. Now only network entity number, CSQC hook code will have to take care of it later. --- qcsrc/csqcmodel/settings.qh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/qcsrc/csqcmodel/settings.qh b/qcsrc/csqcmodel/settings.qh index 4ec6ffb38..2366347f9 100644 --- a/qcsrc/csqcmodel/settings.qh +++ b/qcsrc/csqcmodel/settings.qh @@ -4,6 +4,16 @@ // don't define this ever //#define CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW +// a hack for Xonotic +#ifdef CSQC +# define TAG_ENTITY_NAME tag_networkentity +# define TAG_ENTITY_TYPE float +.float tag_networkentity; +#else +# define TAG_ENTITY_NAME tag_entity +# define TAG_ENTITY_TYPE entity +#endif + // add properties you want networked to CSQC here #define CSQCMODEL_EXTRAPROPERTIES \ CSQCMODEL_IF(isplayer) \ @@ -13,12 +23,9 @@ CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 255, 0, 255) \ CSQCMODEL_ENDIF \ CSQCMODEL_IF(!isplayer) \ - CSQCMODEL_PROPERTY(1, entity, ReadCSQCEntity, WriteEntity, tag_entity) \ + CSQCMODEL_PROPERTY(1, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ CSQCMODEL_ENDIF -// declare "odd" fields here -.entity tag_entity; - // add hook function calls here #define CSQCMODEL_HOOK_PREUPDATE #define CSQCMODEL_HOOK_POSTUPDATE -- 2.39.2