X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fregistry.qh;h=d8f18a02c96e4ab98b749530dd5f1f58550609b5;hp=2b96cf7c4655316047e2d9d44d6f2526c42c6999;hb=988f88a3e0c9ff13570e23b593b69257047188be;hpb=77d6a05629e33da863fccb3cdd03b3c63af890dd

diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh
index 2b96cf7c4..d8f18a02c 100644
--- a/qcsrc/lib/registry.qh
+++ b/qcsrc/lib/registry.qh
@@ -22,10 +22,12 @@
  */
 #define REGISTRY(id, max) \
 	void Register##id(); \
-	[[accumulate]] REGISTRY_BEGIN(id) {} \
-	[[accumulate]] REGISTRY_END(id) {} \
+	ACCUMULATE void REGISTRY_DEPENDS_(id) {} \
+	REGISTRY_BEGIN(id) {} \
+	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,12 +35,16 @@
 	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) ACCUMULATE void REGISTRY_BEGIN_(id) { noref void() f = Register##id; } void REGISTRY_BEGIN_(id)
 #define REGISTRY_BEGIN_(id) Register##id##_First()
 
 /** Called after initializing a registry. */
-#define REGISTRY_END(id) [[accumulate]] void REGISTRY_END_(id) { noref void() f = Register##id; } void REGISTRY_END_(id)
+#define REGISTRY_END(id) ACCUMULATE void REGISTRY_END_(id) { noref void() f = Register##id; } void REGISTRY_END_(id)
 #define REGISTRY_END_(id) Register##id##_Done()
 
 REGISTRY(Registries, BITS(8))
@@ -71,10 +77,13 @@ REGISTRY(Registries, BITS(8))
 	REGISTER_INIT(id) {} \
 	void Register_##id() \
 	{ \
-		if (registry##_COUNT >= registry##_MAX) LOG_FATALF("Registry capacity exceeded (%d)", registry##_MAX); \
-		entity this = id = inst; \
-		this.registered_id = #id; \
-		REGISTRY_PUSH(registry, fld, this); \
+		entity this = id; \
+		if (this == NULL) { \
+			if (registry##_COUNT >= registry##_MAX) LOG_FATALF("Registry capacity exceeded (%d)", registry##_MAX); \
+			this = id = inst; \
+			this.registered_id = #id; \
+			REGISTRY_PUSH(registry, fld, this); \
+		} \
 		Register_##id##_init(this); \
 	} \
 	ACCUMULATE_FUNCTION(_Register##registry, Register_##id) \
@@ -95,7 +104,7 @@ REGISTRY(Registries, BITS(8))
 	REGISTRY_PUSH(registry, fld, e); \
 } MACRO_END
 
-#define REGISTER_INIT(id) [[accumulate]] void Register_##id##_init(entity this)
+#define REGISTER_INIT(id) ACCUMULATE void Register_##id##_init(entity this)
 
 /** internal next pointer */
 #define REGISTRY_NEXT enemy
@@ -137,8 +146,10 @@ REGISTRY(Registries, BITS(8))
 
 #define REGISTRY_HASH(id) Registry_hash_##id
 
-[[accumulate]] void Registry_check(string r, string server) { }
-[[accumulate]] void Registry_send_all() { }
+ERASEABLE
+ACCUMULATE void Registry_check(string r, string server) { }
+ERASEABLE
+ACCUMULATE void Registry_send_all() { }
 
 #ifdef SVQC
 void Registry_send(string id, string hash);
@@ -157,7 +168,7 @@ void Registry_send(string id, string hash);
 		FOREACH(id, true, s = strcat(s, join, it.registered_id)); \
 		s = substring(s, strlen(join), -1); \
 		string h = REGISTRY_HASH(id) = strzone(digest_hex(algo, s)); \
-		LOG_TRACEF(#id ": %s\n[%s]\n", h, s); \
+		LOG_DEBUGF(#id ": %s\n[%s]", h, s); \
 	} \
 	void Registry_check(string r, string sv) \
 	{ \
@@ -166,7 +177,7 @@ void Registry_send(string id, string hash);
 			string cl = REGISTRY_HASH(id); \
 			if (cl != sv) \
 			{ \
-				LOG_FATALF("client/server mismatch (%s).\nCL: %s\nSV: %s\n", r, cl, sv); \
+				LOG_FATALF("client/server mismatch (%s).\nCL: %s\nSV: %s", r, cl, sv); \
 			} \
 		} \
 	} \
@@ -176,9 +187,14 @@ void Registry_send(string id, string hash);
 #define EVAL_REGISTER_REGISTRY(...) __VA_ARGS__
 #define REGISTER_REGISTRY_1(id) REGISTER_REGISTRY_2(id, #id)
 #define REGISTER_REGISTRY_2(id, str) \
-	ACCUMULATE_FUNCTION(__static_init, Register##id) \
+	ACCUMULATE_FUNCTION(__static_init_1, Register##id) \
 	CLASS(id##Registry, Object) \
-		ATTRIB(id##Registry, m_name, string, str) \
-		ATTRIB(id##Registry, REGISTRY_NEXT, entity, id##_first) \
+		ATTRIB(id##Registry, m_name, string, str); \
+		ATTRIB(id##Registry, REGISTRY_NEXT, entity, id##_first); \
+		METHOD(id##Registry, m_reload, void()); \
 	ENDCLASS(id##Registry) \
-	REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry));
+	REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \
+	METHOD(id##Registry, m_reload, void()) { \
+	    id##_state = 0; \
+		Register##id(); \
+	}