From: Rudolf Polzer Date: Wed, 7 Dec 2011 06:02:10 +0000 (+0100) Subject: more props X-Git-Tag: xonotic-v0.6.0~74^2~100^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22195c42b9ca18953dd416092ec355a7ae65283f;p=xonotic%2Fxonotic-data.pk3dir.git more props --- diff --git a/qcsrc/csqcmodel/settings.qh b/qcsrc/csqcmodel/settings.qh index 45f163997..a5f9c8733 100644 --- a/qcsrc/csqcmodel/settings.qh +++ b/qcsrc/csqcmodel/settings.qh @@ -16,21 +16,20 @@ // 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_SCALED(8, float, ReadByte, WriteByte, alpha, 255, 0, 255) \ + CSQCMODEL_PROPERTY(16, float, ReadByte, WriteByte, skin) \ CSQCMODEL_IF(isplayer) \ - CSQCMODEL_PROPERTY(1, float, ReadByte, WriteByte, skin) \ - CSQCMODEL_PROPERTY(2, float, ReadShort, WriteShort, colormap) \ - CSQCMODEL_PROPERTY(4, float, ReadInt24_t, WriteInt24_t, effects) \ - CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 255, 0, 255) \ CSQCMODEL_ENDIF \ CSQCMODEL_IF(!isplayer) \ - CSQCMODEL_PROPERTY(1, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ - CSQCMODEL_PROPERTY(2, float, ReadShort, WriteShort, colormap) \ - CSQCMODEL_PROPERTY_SCALED(4, float, ReadByte, WriteByte, glowmod_x, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(4, float, ReadByte, WriteByte, glowmod_y, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(4, float, ReadByte, WriteByte, glowmod_z, 255, 0, 255) \ - CSQCMODEL_PROPERTY(8, float, ReadInt24_t, WriteInt24_t, effects) \ + CSQCMODEL_PROPERTY(32, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ + CSQCMODEL_PROPERTY_SCALED(64, float, ReadByte, WriteByte, glowmod_x, 255, 0, 255) \ + CSQCMODEL_PROPERTY_SCALED(64, float, ReadByte, WriteByte, glowmod_y, 255, 0, 255) \ + CSQCMODEL_PROPERTY_SCALED(64, float, ReadByte, WriteByte, glowmod_z, 255, 0, 255) \ CSQCMODEL_ENDIF -// TODO get rid of colormod/glowmod here, find good solution for nex charge glowmod hack +// 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 #define CSQCMODEL_HOOK_PREUPDATE \