X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames_hud.qc;h=e93c95ca6077bed5935373c47bf0e1426f4c3315;hb=f203a8239ab58e776da8df7bce46be73d2d655a4;hp=11470ec136acc3929cbd6721a720f8356e06d822;hpb=647e23d9f0565eb51615aee7f27cb4bfb955af66;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index 11470ec13..e93c95ca6 100644
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -1,5 +1,5 @@
+#include "cl_minigames_hud.qh"
 #include "minigames.qh"
-#include "../../client/mapvoting.qh"
 
 // whether the mouse is over the given panel
 bool HUD_mouse_over(entity somepanel)
@@ -211,18 +211,17 @@ void HUD_MinigameMenu_ClickCreate()
 {SELFPARAM();
 	if ( HUD_MinigameMenu_Click_ExpandCollapse() )
 	{
-		entity e;
 		entity curr;
 		entity prev = self;
-		for ( e = minigame_descriptors; e != world; e = e.list_next )
+		FOREACH(Minigames, true, LAMBDA(
 		{
 			curr = HUD_MinigameMenu_SpawnSubEntry(
-				e.message, HUD_MinigameMenu_ClickCreate_Entry,  self );
-			curr.netname = e.netname;
-			curr.model = strzone(minigame_texture(strcat(e.netname,"/icon")));
+				it.message, HUD_MinigameMenu_ClickCreate_Entry,  self );
+			curr.netname = it.netname;
+			curr.model = strzone(minigame_texture(strcat(it.netname,"/icon")));
 			HUD_MinigameMenu_InsertEntry( curr, prev );
 			prev = curr;
-		}
+		}));
 	}
 }
 
@@ -284,11 +283,11 @@ void HUD_MinigameMenu_ClickInvite()
 		entity prev = self;
 		for(int i = 0; i < maxclients; ++i)
 		{
-			if ( player_localnum != i && playerslots[i] && GetPlayerName(i) != "" &&
+			if ( player_localnum != i && playerslots[i] && entcs_GetName(i) != "" &&
 				!findfloat(world,minigame_playerslot,i+1) && playerslots[i].ping )
 			{
 				e = HUD_MinigameMenu_SpawnSubEntry(
-					strzone(GetPlayerName(i)), HUD_MinigameMenu_ClickInvite_Entry,
+					strzone(entcs_GetName(i)), HUD_MinigameMenu_ClickInvite_Entry,
 					self );
 				e.flags |= 1;
 				e.netname = strzone(ftos(i+1));
@@ -333,7 +332,7 @@ void HUD_MinigameMenu_ClickCurrentGame()
 // Whether the minigame menu panel is open
 bool HUD_MinigameMenu_IsOpened()
 {
-	return !!HUD_MinigameMenu_entries;
+	return HUD_MinigameMenu_entries != NULL;
 }
 
 // Close the minigame menu panel
@@ -693,5 +692,5 @@ void HUD_Minigame_Mouse()
 
 bool HUD_Minigame_Showpanels()
 {
-	return HUD_MinigameMenu_IsOpened() && ( autocvar__hud_configure || minigame_isactive() );
+	return (HUD_MinigameMenu_IsOpened() && minigame_isactive());
 }