X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fsv_minigames.qh;h=70c9bf80581c05e797ae76b79cc3d2a69ebc649b;hb=450125fe9fa5ce6324db12446fe689cbde0678a3;hp=43b392f743a843caf5ecf26be5996be40a431536;hpb=13b3855f3bb15ac77e0cf442158b2f005f8256ec;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh
index 43b392f74..70c9bf805 100644
--- a/qcsrc/common/minigames/sv_minigames.qh
+++ b/qcsrc/common/minigames/sv_minigames.qh
@@ -24,13 +24,13 @@ void end_minigames();
 
 // Only sends entities to players who joined the minigame
 // Use on customizeentityforclient for gameplay entities
-bool minigame_CheckSend();
+bool minigame_CheckSend(entity this);
 
 // 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);
+void ClientCommand_minigame(entity caller, int request, int argc, string command);
 
 // Find the minigame_player entity for the given client entity
 entity minigame_find_player(entity client);
@@ -44,22 +44,20 @@ entity minigame_find_player(entity client);
 
 entity minigame_sessions;
 
-bool minigame_SendEntity(entity to, int sf);
+bool minigame_SendEntity(entity this, entity to, int sf);
 
-void RegisterMinigames();
-const int MINIGAMES_MAX = 24;
-entity MINIGAMES[MINIGAMES_MAX], MINIGAMES_first, MINIGAMES_last;
-int MINIGAMES_COUNT;
+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, MINIGAMES_COUNT, name, m_id, spawn()); \
+    REGISTER(Minigames, MINIGAME_##name, m_id, new_pure(minigame_descriptor)); \
     int name##_server_event(entity, string, ...); \
-    REGISTER_INIT_POST(MINIGAME, name) { \
-        this.classname = "minigame_descriptor"; \
+    REGISTER_INIT(MINIGAME_##name) { \
         this.netname = strzone(strtolower(#name)); \
         this.message = nicename; \
 		this.minigame_event = name##_server_event; \
     } \
-    REGISTER_INIT(MINIGAME, name)
-REGISTER_REGISTRY(RegisterMinigames)
+    REGISTER_INIT(MINIGAME_##name)
 
 #endif