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 c9591bb1310200f0a19c5c45a4e63b721874fc5f..0fb3d572cc6996d2849bb9ccc17f69c94c58d4ba 100644 (file)
--- a/qcsrc/common/minigames/sv_minigames.qh
+++ b/qcsrc/common/minigames/sv_minigames.qh
@@ -1,9 +1,6 @@
 #ifndef SV_MINIGAMES_H
 #define SV_MINIGAMES_H
 
-/// Initialize the minigame system
-void initialize_minigames();
-
 /// Create a new minigame session
 /// \return minigame session entity
 entity start_minigame(entity player, string minigame );
@@ -27,13 +24,13 @@ void end_minigames();
 
 // Only sends entities to players who joined the minigame
 // Use on customizeentityforclient for gameplay entities
-float minigame_CheckSend();
+bool minigame_CheckSend();
 
 // Check for minigame impulses
-float MinigameImpulse(float imp);
+bool MinigameImpulse(int imp);
 
 // Parse a client command ( cmd minigame ... )
-void ClientCommand_minigame(float request, float argc, string command);
+void ClientCommand_minigame(int request, int argc, string command);
 
 // Find the minigame_player entity for the given client entity
 entity minigame_find_player(entity client);
@@ -47,8 +44,21 @@ entity minigame_find_player(entity client);
 
 entity minigame_sessions;
 
-float minigame_SendEntity(entity to, float sf);
-
-var void remove(entity e);
+bool minigame_SendEntity(entity this, entity to, int sf);
+
+REGISTRY(Minigames, BITS(3))
+#define Minigames_from(i) _Minigames_from(i, NULL)
+REGISTER_REGISTRY(Minigames)
+REGISTRY_CHECK(Minigames)
+#define REGISTER_MINIGAME(name,nicename) \
+    REGISTER(Minigames, MINIGAME_##name, m_id, new(minigame_descriptor)); \
+    int name##_server_event(entity, string, ...); \
+    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)
 
 #endif