X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud_config.qc;h=0b4c58c2160babae9ea7decb39cc8e9426f676d0;hb=93ea212d8c60d8c3e897f8b5b613ee112f88aa37;hp=c4ae095ac3c559c7c3fd67a06084f990f0246e0a;hpb=b7873b3470e961ee95d5823de13a87a63e7e0f3b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc
index c4ae095ac..0b4c58c21 100644
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -3,8 +3,7 @@
 #include "hud.qh"
 #include "panel/scoreboard.qh"
 #include <client/autocvars.qh>
-#include <client/defs.qh>
-#include <client/miscfunctions.qh>
+#include <client/draw.qh>
 #include <client/view.qh>
 
 // Save the config
@@ -60,9 +59,9 @@ void HUD_Panel_ExportCfg(string cfgname)
 		HUD_Write("\n");
 
 		// common cvars for all panels
-		for (int i = 0; i < hud_panels_COUNT; ++i)
+		for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 		{
-			panel = hud_panels_from(i);
+			panel = REGISTRY_GET(hud_panels, i);
 
 			HUD_Write_PanelCvar("_pos");
 			HUD_Write_PanelCvar("_size");
@@ -102,8 +101,8 @@ vector HUD_Panel_CheckMove(vector myPos, vector mySize)
 	vector myCenter, targCenter;
 	vector myTarget = myPos;
 	int i;
-	for (i = 0; i < hud_panels_COUNT; ++i) {
-		panel = hud_panels_from(i);
+	for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {
+		panel = REGISTRY_GET(hud_panels, i);
 		if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
 		if(panel == highlightedPanel) continue;
 		HUD_Panel_UpdatePosSize();
@@ -199,8 +198,8 @@ vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) {
 	vector dist;
 	float ratio = mySize.x/mySize.y;
 	int i;
-	for (i = 0; i < hud_panels_COUNT; ++i) {
-		panel = hud_panels_from(i);
+	for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {
+		panel = REGISTRY_GET(hud_panels, i);
 		if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
 		if(panel == highlightedPanel) continue;
 		HUD_Panel_UpdatePosSize();
@@ -500,13 +499,13 @@ void HUD_Panel_Arrow_Action(float nPrimary)
 	}
 }
 
-entity tab_panels[hud_panels_MAX];
+entity tab_panels[REGISTRY_MAX(hud_panels)];
 entity tab_panel;
 vector tab_panel_pos;
 float tab_backward;
 void reset_tab_panels()
 {
-	for (int i = 0; i < hud_panels_COUNT; ++i)
+	for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 		tab_panels[i] = NULL;
 }
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
@@ -645,9 +644,9 @@ LABEL(find_tab_panel)
 		k=0;
 		while(++k)
 		{
-			for(i = 0; i < hud_panels_COUNT; ++i)
+			for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 			{
-				panel = hud_panels_from(i);
+				panel = REGISTRY_GET(hud_panels, i);
 				if(!(panel.panel_configflags & PANEL_CONFIG_MAIN))
 					continue;
 				if (panel == tab_panels[i] || panel == starting_panel)
@@ -794,12 +793,12 @@ LABEL(find_tab_panel)
 int HUD_Panel_Check_Mouse_Pos(bool allow_move)
 {
 	int i, j = 0;
-	while(j < hud_panels_COUNT)
+	while(j < REGISTRY_COUNT(hud_panels))
 	{
 		i = panel_order[j];
 		j += 1;
 
-		panel = hud_panels_from(i);
+		panel = REGISTRY_GET(hud_panels, i);
 		if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
 		HUD_Panel_UpdatePosSize();
 
@@ -840,7 +839,7 @@ void HUD_Panel_FirstInDrawQ(float id)
 	int i;
 	int place = -1;
 	// find out where in the array our current id is, save into place
-	for(i = 0; i < hud_panels_COUNT; ++i)
+	for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 	{
 		if(panel_order[i] == id)
 		{
@@ -850,7 +849,7 @@ void HUD_Panel_FirstInDrawQ(float id)
 	}
 	// place last if we didn't find a place for it yet (probably new panel, or screwed up cvar)
 	if(place == -1)
-		place = hud_panels_COUNT - 1;
+		place = REGISTRY_COUNT(hud_panels) - 1;
 
 	// move all ids up by one step in the array until "place"
 	for(i = place; i > 0; --i)
@@ -862,7 +861,7 @@ void HUD_Panel_FirstInDrawQ(float id)
 
 	// let's save them into the cvar by some strcat trickery
 	string s = "";
-	for(i = 0; i < hud_panels_COUNT; ++i)
+	for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 	{
 		s = strcat(s, ftos(panel_order[i]), " ");
 	}
@@ -874,12 +873,12 @@ void HUD_Panel_Highlight(float allow_move)
 {
 	int i, j = 0;
 
-	while(j < hud_panels_COUNT)
+	while(j < REGISTRY_COUNT(hud_panels))
 	{
 		i = panel_order[j];
 		j += 1;
 
-		panel = hud_panels_from(i);
+		panel = REGISTRY_GET(hud_panels, i);
 		if(!(panel.panel_configflags & PANEL_CONFIG_MAIN))
 			continue;
 		HUD_Panel_UpdatePosSize();
@@ -889,7 +888,7 @@ void HUD_Panel_Highlight(float allow_move)
 		// move
 		if(allow_move && mousepos.x > panel_pos.x && mousepos.y > panel_pos.y && mousepos.x < panel_pos.x + panel_size.x && mousepos.y < panel_pos.y + panel_size.y)
 		{
-			highlightedPanel = hud_panels_from(i);
+			highlightedPanel = REGISTRY_GET(hud_panels, i);
 			HUD_Panel_FirstInDrawQ(i);
 			highlightedAction = 1;
 			panel_click_distance = mousepos - panel_pos;
@@ -898,7 +897,7 @@ void HUD_Panel_Highlight(float allow_move)
 		// resize from topleft border
 		else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
 		{
-			highlightedPanel = hud_panels_from(i);
+			highlightedPanel = REGISTRY_GET(hud_panels, i);
 			HUD_Panel_FirstInDrawQ(i);
 			highlightedAction = 2;
 			resizeCorner = 1;
@@ -909,7 +908,7 @@ void HUD_Panel_Highlight(float allow_move)
 		// resize from topright border
 		else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
 		{
-			highlightedPanel = hud_panels_from(i);
+			highlightedPanel = REGISTRY_GET(hud_panels, i);
 			HUD_Panel_FirstInDrawQ(i);
 			highlightedAction = 2;
 			resizeCorner = 2;
@@ -921,7 +920,7 @@ void HUD_Panel_Highlight(float allow_move)
 		// resize from bottomleft border
 		else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + panel_size.y + border)
 		{
-			highlightedPanel = hud_panels_from(i);
+			highlightedPanel = REGISTRY_GET(hud_panels, i);
 			HUD_Panel_FirstInDrawQ(i);
 			highlightedAction = 2;
 			resizeCorner = 3;
@@ -933,7 +932,7 @@ void HUD_Panel_Highlight(float allow_move)
 		// resize from bottomright border
 		else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + panel_size.y + border)
 		{
-			highlightedPanel = hud_panels_from(i);
+			highlightedPanel = REGISTRY_GET(hud_panels, i);
 			HUD_Panel_FirstInDrawQ(i);
 			highlightedAction = 2;
 			resizeCorner = 4;
@@ -1082,8 +1081,8 @@ void HUD_Configure_Frame()
 		if(!hud_configure_prev)
 		{
 			hudShiftState = 0;
-			for(i = hud_panels_COUNT - 1; i >= 0; --i)
-				hud_panels_from(panel_order[i]).update_time = time;
+			for(i = REGISTRY_COUNT(hud_panels) - 1; i >= 0; --i)
+				REGISTRY_GET(hud_panels, panel_order[i]).update_time = time;
 		}
 
 		// NOTE this check is necessary because _menu_alpha isn't updated the frame the menu gets enabled