Merge branch 'master' into terencehill/tooltips_cleanup

[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..43b392f743a843caf5ecf26be5996be40a431536 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,22 @@ 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 to, int sf);
+
+void RegisterMinigames();
+const int MINIGAMES_MAX = 24;
+entity MINIGAMES[MINIGAMES_MAX], MINIGAMES_first, MINIGAMES_last;
+int MINIGAMES_COUNT;
+#define REGISTER_MINIGAME(name,nicename) \
+    REGISTER(RegisterMinigames, MINIGAME, MINIGAMES, MINIGAMES_COUNT, name, m_id, spawn()); \
+    int name##_server_event(entity, string, ...); \
+    REGISTER_INIT_POST(MINIGAME, name) { \
+        this.classname = "minigame_descriptor"; \
+        this.netname = strzone(strtolower(#name)); \
+        this.message = nicename; \
+               this.minigame_event = name##_server_event; \
+    } \
+    REGISTER_INIT(MINIGAME, name)
+REGISTER_REGISTRY(RegisterMinigames)
 
 #endif