Merge branch 'Mario/intrusive' into 'master'

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

diff --git a/qcsrc/common/minigames/cl_minigames.qh b/qcsrc/common/minigames/cl_minigames.qh
index a839b1106194a7156bd56d669f4aefc720686cba..cc24d4bf0c69256717525a81ced1e28360ac5941 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames.qh
+++ b/qcsrc/common/minigames/cl_minigames.qh
@@ -1,8 +1,6 @@
 #ifndef CL_MINIGAMES_H
 #define CL_MINIGAMES_H
 
-#include "../../dpdefs/keycodes.qh"
-
 // Get a square in the center of the avaliable area
 // \note macro to pass by reference pos and mySize
 #define minigame_hud_fitsqare(pos, mySize) \
@@ -79,9 +77,6 @@ string minigame_texture(string name);
 // For minigame_player: player server slot, don't use for anything else
 .float minigame_playerslot;
 
-// register all minigames
-void initialize_minigames();
-
 // client-side minigame session cleanup
 void deactivate_minigame();
 
@@ -93,29 +88,45 @@ entity minigame_self;
 // Whethere there's an active minigame
 float minigame_isactive()
 {
-       return active_minigame != world;
+       return active_minigame != NULL;
 }
 
 // Execute a minigame command
 #define minigame_cmd(...) minigame_cmd_workaround(0,__VA_ARGS__)
 void minigame_cmd_workaround(float dummy, string...cmdargc);
 
-// Read a minigame entity from the server
-void ent_read_minigame();
-
 // Prompt the player to play in the current minigame
 // (ie: it's their turn and they should get back to the minigame)
 void minigame_prompt();
 
 float HUD_MinigameMenu_IsOpened();
-void HUD_MinigameMenu_Close();
+void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger);
 float HUD_Minigame_Showpanels();
 // Adds a game-specific entry to the menu
 void HUD_MinigameMenu_CustomEntry(entity parent, string message, string event_arg);
 
 
 #define FOREACH_MINIGAME_ENTITY(entityvar) \
-       entityvar=world; \
+       entityvar=NULL; \
        while( (entityvar = findentity(entityvar,owner,active_minigame)) )
 
+
+REGISTRY(Minigames, BITS(4))
+#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_pure(minigame_descriptor)); \
+    void name##_hud_board(vector, vector); \
+    void name##_hud_status(vector, vector); \
+    int name##_client_event(entity, string, ...); \
+    REGISTER_INIT(MINIGAME_##name) { \
+        this.netname = strzone(strtolower(#name)); \
+        this.message = nicename; \
+        this.minigame_hud_board = name##_hud_board; \
+               this.minigame_hud_status = name##_hud_status; \
+               this.minigame_event = name##_client_event; \
+    } \
+    REGISTER_INIT(MINIGAME_##name)
+
 #endif