Merge branch 'terencehill/menu_gametype_sliders' into 'master'

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

diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh
index 422e780819957e536fe5f845db6a4df7ffdd7767..0fb3d572cc6996d2849bb9ccc17f69c94c58d4ba 100644 (file)
--- a/qcsrc/common/minigames/sv_minigames.qh
+++ b/qcsrc/common/minigames/sv_minigames.qh
@@ -48,16 +48,17 @@ bool minigame_SendEntity(entity this, entity to, int sf);
 
 REGISTRY(Minigames, BITS(3))
 #define Minigames_from(i) _Minigames_from(i, NULL)
-REGISTER_REGISTRY(RegisterMinigames)
+REGISTER_REGISTRY(Minigames)
+REGISTRY_CHECK(Minigames)
 #define REGISTER_MINIGAME(name,nicename) \
-    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, new(minigame_descriptor)); \
+    REGISTER(Minigames, MINIGAME_##name, m_id, new(minigame_descriptor)); \
     int name##_server_event(entity, string, ...); \
-    REGISTER_INIT_POST(MINIGAME, name) { \
+    REGISTER_INIT_POST(MINIGAME_##name) { \
         make_pure(this); \
         this.netname = strzone(strtolower(#name)); \
         this.message = nicename; \
                this.minigame_event = name##_server_event; \
     } \
-    REGISTER_INIT(MINIGAME, name)
+    REGISTER_INIT(MINIGAME_##name)
 
 #endif