X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames_hud.qc;h=51155f236fffaf0357b4615a3e0123c91cc1cd97;hb=ef74e1ba8e890befb4a4892a96d244a66c05fd48;hp=4bf4b1b3e1f5f898e88889f9436efaa2fdcb5d92;hpb=e50df489b3950ab7d3debd73decdd52c4a074e96;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 4bf4b1b3e..51155f236 100644
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -79,22 +79,22 @@ entity HUD_MinigameMenu_entries;
 entity HUD_MinigameMenu_last_entry;
 
 // Minigame menu options: insert entry after the given location
-void HUD_MinigameMenu_InsertEntry(entity new, entity prev)
+void HUD_MinigameMenu_InsertEntry(entity newentry, entity prev)
 {
 	if ( !HUD_MinigameMenu_entries )
 	{
-		HUD_MinigameMenu_entries = new;
-		HUD_MinigameMenu_last_entry = new;
+		HUD_MinigameMenu_entries = newentry;
+		HUD_MinigameMenu_last_entry = newentry;
 		return;
 	}
 	
-	new.list_prev = prev;
-	new.list_next = prev.list_next;
+	newentry.list_prev = prev;
+	newentry.list_next = prev.list_next;
 	if ( prev.list_next )
-		prev.list_next.list_prev = new;
+		prev.list_next.list_prev = newentry;
 	else
-		HUD_MinigameMenu_last_entry = new;
-	prev.list_next = new;
+		HUD_MinigameMenu_last_entry = newentry;
+	prev.list_next = newentry;
 	
 }
 
@@ -104,13 +104,10 @@ entity HUD_MinigameMenu_activeitem;
 
 // Click the given item
 void HUD_MinigameMenu_Click(entity menuitem)
-{
+{SELFPARAM();
 	if ( menuitem )
 	{
-		entity e = self;
-		self = menuitem;
-		menuitem.use();
-		self = e;
+		WITH(entity, self, menuitem, menuitem.use());
 	}
 }
 
@@ -167,14 +164,14 @@ entity HUD_MinigameMenu_SpawnSubEntry(string s, void() click, entity parent)
 
 // Click action for Create sub-entries
 void HUD_MinigameMenu_ClickCreate_Entry()
-{
+{SELFPARAM();
 	minigame_cmd("create ",self.netname);
 }
 
 // Helper click action for collapsible entries
 // returns true when you have to create the sub-entries
 bool HUD_MinigameMenu_Click_ExpandCollapse()
-{
+{SELFPARAM();
 	entity e;
 	if ( self.flags & 2 )
 	{
@@ -211,7 +208,7 @@ bool HUD_MinigameMenu_Click_ExpandCollapse()
 
 // Click action for the Create menu
 void HUD_MinigameMenu_ClickCreate()
-{
+{SELFPARAM();
 	if ( HUD_MinigameMenu_Click_ExpandCollapse() )
 	{
 		entity e;
@@ -231,14 +228,14 @@ void HUD_MinigameMenu_ClickCreate()
 
 // Click action for Join sub-entries
 void HUD_MinigameMenu_ClickJoin_Entry()
-{
+{SELFPARAM();
 	minigame_cmd("join ",self.netname);
 	HUD_MinigameMenu_EraseEntry(self);
 }
 
 // Click action for the Join menu
 void HUD_MinigameMenu_ClickJoin()
-{
+{SELFPARAM();
 	if ( HUD_MinigameMenu_Click_ExpandCollapse() )
 	{
 		entity e = world;
@@ -274,13 +271,13 @@ void HUD_MinigameMenu_ClickQuit()
 
 // Click action for Invite sub-entries
 void HUD_MinigameMenu_ClickInvite_Entry()
-{
+{SELFPARAM();
 	minigame_cmd("invite #",self.netname);
 }
 
 // Click action for the Invite menu
 void HUD_MinigameMenu_ClickInvite()
-{
+{SELFPARAM();
 	if ( HUD_MinigameMenu_Click_ExpandCollapse() )
 	{
 		entity e;
@@ -304,7 +301,7 @@ void HUD_MinigameMenu_ClickInvite()
 }
 
 void HUD_MinigameMenu_ClickCustomEntry()
-{
+{SELFPARAM();
 	if ( active_minigame )
 		active_minigame.minigame_event(active_minigame,"menu_click",self.netname);
 }
@@ -321,7 +318,7 @@ void HUD_MinigameMenu_CustomEntry(entity parent, string menumessage, string even
 
 // Click action for the Current Game menu
 void HUD_MinigameMenu_ClickCurrentGame()
-{
+{SELFPARAM();
 	if ( HUD_MinigameMenu_Click_ExpandCollapse() )
 	{
 		HUD_MinigameMenu_InsertEntry( HUD_MinigameMenu_SpawnSubEntry(
@@ -484,7 +481,7 @@ void HUD_MinigameMenu ()
 
 	HUD_MinigameMenu_DrawEntry(panel_pos,_("Minigames"),hud_fontsize*2,'0.25 0.47 0.72');
 	panel_pos_y += hud_fontsize_y*2;
-	
+
 	vector color;
 	vector offset;
 	float itemh;