Merge branch 'master' into terencehill/bot_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / registry.qh

diff --git a/qcsrc/common/registry.qh b/qcsrc/common/registry.qh
index 5a15337cf64bd6944110d9c0f0a3bd4cf8816d4a..6e8557edfd8808a10c0426e6c102d1f1c1304a98 100644 (file)
--- a/qcsrc/common/registry.qh
+++ b/qcsrc/common/registry.qh
@@ -1,13 +1,16 @@
 #ifndef REGISTRY_H
 #define REGISTRY_H
 
+#include "oo.qh"
 #include "util.qh"
 
 #define REGISTER_INIT(ns, id) [[accumulate]] void Register_##ns##_##id##_init(entity this)
+#define REGISTER_INIT_POST(ns, id) [[accumulate]] void Register_##ns##_##id##_init_post(entity this)
 
 #define REGISTER(initfunc, ns, array, counter, id, fld, inst)   \
     entity ns##_##id;                                           \
     REGISTER_INIT(ns, id) { }                                   \
+    REGISTER_INIT_POST(ns, id) { }                              \
     .entity enemy; /* internal next pointer */                  \
     void Register_##ns##_##id() {                               \
         entity this = inst;                                     \
@@ -18,6 +21,7 @@
         if ( array##_last)     array##_last.enemy = this;       \
         array##_last = this;                                    \
         Register_##ns##_##id##_init(this);                      \
+        Register_##ns##_##id##_init_post(this);                 \
     }                                                           \
     ACCUMULATE_FUNCTION(initfunc, Register_##ns##_##id)         \
     REGISTER_INIT(ns, id)