Merge branch 'master' into Mario/balance

[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 4359dba22630ae9e5ec93236ace5a31645962401..cc24d4bf0c69256717525a81ced1e28360ac5941 100644 (file)
--- 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
@@ -107,7 +107,7 @@ void HUD_MinigameMenu_CustomEntry(entity parent, string message, string event_ar
 
 
 #define FOREACH_MINIGAME_ENTITY(entityvar) \
-       entityvar=world; \
+       entityvar=NULL; \
        while( (entityvar = findentity(entityvar,owner,active_minigame)) )