X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames.qh;h=cc24d4bf0c69256717525a81ced1e28360ac5941;hb=5c9dd3786d57cbbbca67043ba8076548c1d486ef;hp=6fb461c6beed194767fcb93f9211b48e3adb72cc;hpb=43eba8ca70f00458db385630f86009f6d7fa849a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/cl_minigames.qh b/qcsrc/common/minigames/cl_minigames.qh
index 6fb461c6b..cc24d4bf0 100644
--- a/qcsrc/common/minigames/cl_minigames.qh
+++ b/qcsrc/common/minigames/cl_minigames.qh
@@ -88,7 +88,7 @@ entity minigame_self;
 // Whethere there's an active minigame
 float minigame_isactive()
 {
-	return active_minigame != world;
+	return active_minigame != NULL;
 }
 
 // Execute a minigame command
@@ -100,34 +100,33 @@ void minigame_cmd_workaround(float dummy, string...cmdargc);
 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(3))
+REGISTRY(Minigames, BITS(4))
 #define Minigames_from(i) _Minigames_from(i, NULL)
-REGISTER_REGISTRY(RegisterMinigames)
+REGISTER_REGISTRY(Minigames)
 REGISTRY_CHECK(Minigames)
 #define REGISTER_MINIGAME(name,nicename) \
-    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, new(minigame_descriptor)); \
+    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_POST(MINIGAME, name) { \
-        make_pure(this); \
+    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)
+    REGISTER_INIT(MINIGAME_##name)
 
 #endif