Merge remote-tracking branch 'origin/master' into Juhu/strafehud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / all.qc

diff --git a/qcsrc/common/effects/all.qc b/qcsrc/common/effects/all.qc
index 9732be2e3bf65e82f125b176f8ed2f709d2879d6..9ee58f5fe1c07323097ca2c08ff2f9df091bf34f 100644 (file)
--- a/qcsrc/common/effects/all.qc
+++ b/qcsrc/common/effects/all.qc
@@ -4,9 +4,9 @@ REGISTER_NET_TEMP(net_effect)
 #ifdef CSQC
 NET_HANDLE(net_effect, bool isNew)
 {
-       int net_name = (Effects_COUNT >= 255) ? ReadShort() : ReadByte();
+       int net_name = (REGISTRY_COUNT(Effects) >= 255) ? ReadShort() : ReadByte();
 
-       entity eff = Effects_from(net_name);
+       entity eff = REGISTRY_GET(Effects, net_name);
 
        vector vel = '0 0 0';
        int eff_cnt = 1;
@@ -34,7 +34,7 @@ bool Net_Write_Effect(entity this, entity client, int sf)
        int channel = MSG_ONE;
        msg_entity = client;
        WriteHeader(channel, net_effect);
-       (Effects_COUNT >= 255)
+       (REGISTRY_COUNT(Effects) >= 255)
        ? WriteShort(channel, this.m_id)
        : WriteByte(channel, this.m_id);
        WriteVector(channel, this.eent_net_location);