X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fsv_minigames.qh;h=2a8496932c177d6b928f85982c2054aa2a00dd00;hp=e36d690d9bc743247aabbc104a3f7971e6e24b5a;hb=64b8409b2d6fb93dc51ba24a82d219c8cd56a907;hpb=c51698509e174e343dff48128a1dcfff1527c535

diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh
index e36d690d9b..2a8496932c 100644
--- a/qcsrc/common/minigames/sv_minigames.qh
+++ b/qcsrc/common/minigames/sv_minigames.qh
@@ -27,7 +27,7 @@ void end_minigames();
 bool minigame_CheckSend();
 
 // Check for minigame impulses
-bool MinigameImpulse(int imp);
+bool MinigameImpulse(entity this, int imp);
 
 // Parse a client command ( cmd minigame ... )
 void ClientCommand_minigame(int request, int argc, string command);
@@ -46,17 +46,19 @@ entity minigame_sessions;
 
 bool minigame_SendEntity(entity this, entity to, int sf);
 
-REGISTRY(Minigames, BIT(3))
-REGISTER_REGISTRY(RegisterMinigames)
+REGISTRY(Minigames, BITS(4))
+#define Minigames_from(i) _Minigames_from(i, NULL)
+REGISTER_REGISTRY(Minigames)
+REGISTRY_CHECK(Minigames)
 #define REGISTER_MINIGAME(name,nicename) \
-    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, spawn()); \
+    REGISTER(Minigames, MINIGAME_##name, m_id, new(minigame_descriptor)); \
     int name##_server_event(entity, string, ...); \
-    REGISTER_INIT_POST(MINIGAME, name) { \
-        this.classname = "minigame_descriptor"; \
+    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