X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fregistry.qh;h=8ca07b43f3d34ecaa83e63b1810f415e26ad47a6;hb=04692f3bf447ec38a1bbb0a330c288bbe7a42726;hp=e9712970eb8747fa7a8925d0f4b7e8cdc6d5606a;hpb=387c8741f204da7abe419adbdbccccaa8110d20d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh
index e9712970e..8ca07b43f 100644
--- a/qcsrc/lib/registry.qh
+++ b/qcsrc/lib/registry.qh
@@ -22,10 +22,12 @@
  */
 #define REGISTRY(id, max) \
 	void Register##id(); \
+	[[accumulate]] void REGISTRY_DEPENDS_(id) {} \
 	[[accumulate]] REGISTRY_BEGIN(id) {} \
 	[[accumulate]] REGISTRY_END(id) {} \
 	void _Register##id() {} \
-	void Register##id() { REGISTRY_BEGIN_(id); _Register##id(); REGISTRY_END_(id); } \
+	int id##_state = 0; \
+	void Register##id() { if (id##_state) return; id##_state = 1; REGISTRY_DEPENDS_(id); REGISTRY_BEGIN_(id); _Register##id(); id##_state = 2; REGISTRY_END_(id); } \
 	const int id##_MAX = max; \
 	int id##_COUNT; \
 	noref entity id##_first, id##_last; \
@@ -33,6 +35,10 @@
 	SHUTDOWN(id) { _R_DEL(_##id); } \
 	entity _##id##_from(int i, entity null) { if (i >= 0 && i < id##_COUNT) { entity e = _R_GET(_##id, i); if (e) return e; } return null; }
 
+/** Add registry dependencies to a registry */
+#define REGISTRY_DEPENDS(id, dep) void Register##dep(); void REGISTRY_DEPENDS_(id) { Register##dep(); }
+#define REGISTRY_DEPENDS_(id) Register##id##_Depends()
+
 /** Called before initializing a registry. */
 #define REGISTRY_BEGIN(id) [[accumulate]] void REGISTRY_BEGIN_(id) { noref void() f = Register##id; } void REGISTRY_BEGIN_(id)
 #define REGISTRY_BEGIN_(id) Register##id##_First()
@@ -140,9 +146,9 @@ REGISTRY(Registries, BITS(8))
 
 #define REGISTRY_HASH(id) Registry_hash_##id
 
-[[eraseable]]
+ERASEABLE
 [[accumulate]] void Registry_check(string r, string server) { }
-[[eraseable]]
+ERASEABLE
 [[accumulate]] void Registry_send_all() { }
 
 #ifdef SVQC
@@ -189,5 +195,6 @@ void Registry_send(string id, string hash);
 	ENDCLASS(id##Registry) \
 	REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \
 	METHOD(id##Registry, m_reload, void()) { \
+	    id##_state = 0; \
 		Register##id(); \
 	}