make menu code compile

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 7b3b49cb86ebd2cc44abe088436c9fe6cecce2b9..5c7ae68d716475b01aec281a51d23dbbe2f61b07 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1327,7 +1327,8 @@ void HUD_Panel_Mouse()
                        disable_menu_alphacheck = 2;
                        menu_enabled = 1;
                        menu_enabled_time = time;
-                       localcmd("menu_showhudoptions ", ftos(highlightedPanel), "\n");
+                       HUD_Panel_GetName(highlightedPanel)
+                       localcmd("menu_showhudoptions ", panel_name, "\n");
                        return;
                }
                if(prevMouseClicked == 0)
@@ -1699,7 +1700,7 @@ void HUD_Inventory(void)
        }
 }
 
-void DrawNumIcon(float id, vector myPos, vector mySize, float x, string icon, float left, vector color)
+void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color)
 {
        vector newSize, newPos;
        if(mySize_x/mySize_y > 3)
@@ -1719,10 +1720,7 @@ void DrawNumIcon(float id, vector myPos, vector mySize, float x, string icon, fl
                newPos_x = myPos_x;
        }
 
-       HUD_Panel_GetName(id);
        vector picpos, numpos;
-       float iconalign;
-       iconalign = cvar(strcat("hud_", panel_name, "_iconalign"));
        if(left)
        {
                if(iconalign == 1 || iconalign == 3) // right align
@@ -1824,15 +1822,11 @@ void HUD_Powerups(void) {
        leftalpha = bound(0, leftexact, 1);
        rightalpha = bound(0, rightexact, 1);
 
-       float baralign, iconalign;
-       baralign = cvar(strcat("hud_", panel_name, "_baralign"));
-       iconalign = cvar(strcat("hud_", panel_name, "_iconalign"));
-
        if (mySize_x/mySize_y > 4)
        {
                if(leftcnt)
                {
-                       if(baralign == 1 || baralign == 3) { // right align
+                       if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // right align
                                barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30);
                                barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
                        } else { // left align
@@ -1841,7 +1835,7 @@ void HUD_Powerups(void) {
                        }
 
                        HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       DrawNumIcon(id, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1');
+                       DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1');
                        // TODO: expand
                        //if(leftcnt <= 5)
                        //      drawpic_aspect_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
@@ -1851,7 +1845,7 @@ void HUD_Powerups(void) {
 
                if(rightcnt)
                {
-                       if(baralign == 0 || baralign == 3) { // left align
+                       if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // left align
                                barpos = pos + eX * 0.5 * mySize_x;
                                barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
                        } else { // right align
@@ -1860,14 +1854,14 @@ void HUD_Powerups(void) {
                        }
 
                        HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       DrawNumIcon(id, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1');
+                       DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1');
                }
        }
        else if (mySize_x/mySize_y > 1.5)
        {
                if(leftcnt)
                {
-                       if(baralign == 1 || baralign == 3) { // right align
+                       if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // right align
                                barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30);
                                barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
                        } else { // left align
@@ -1876,12 +1870,12 @@ void HUD_Powerups(void) {
                        }
 
                        HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       DrawNumIcon(id, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1');
+                       DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1');
                }
 
                if(rightcnt)
                {
-                       if(baralign == 0 || baralign == 3) { // left align
+                       if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // left align
                                barpos = pos + eY * 0.5 * mySize_y;
                                barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
                        } else { // right align
@@ -1890,14 +1884,14 @@ void HUD_Powerups(void) {
                        }
 
                        HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       DrawNumIcon(id, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1');
+                       DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1');
                }
        }
        else
        {
                if(leftcnt)
                {
-                       if(baralign == 1 || baralign == 3) { // down align
+                       if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // down align
                                barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
                        } else { // up align
@@ -1905,7 +1899,7 @@ void HUD_Powerups(void) {
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
                        }
 
-                       if(iconalign == 1 || iconalign == 3) { // down align
+                       if(autocvar_hud_powerups_iconalign == 1 || autocvar_hud_powerups_iconalign == 3) { // down align
                                picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
                                numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
                        } else { // up align
@@ -1923,7 +1917,7 @@ void HUD_Powerups(void) {
 
                if(rightcnt)
                {
-                       if(baralign == 0 || baralign == 3) { // up align
+                       if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // up align
                                barpos = pos + eX * 0.5 * mySize_x;
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
                        } else { // down align
@@ -1931,7 +1925,7 @@ void HUD_Powerups(void) {
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
                        }
 
-                       if(iconalign == 0 || iconalign == 3) { // up align
+                       if(autocvar_hud_powerups_iconalign == 0 || autocvar_hud_powerups_iconalign == 3) { // up align
                                picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
                                numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
                        } else { // down align

diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc
index 4a89ab9bae5958726c0254a7f7ea2fc6f7214a49..d2ef187664439735b203728530543167fc54b477 100644 (file)
--- a/qcsrc/menu/gamecommand.qc
+++ b/qcsrc/menu/gamecommand.qc
@@ -64,9 +64,8 @@ void GameCommand(string theCommand)
 
        if(argv(0) == "directpanelhudmenu")
        {
-               highlightedPanel = stof(argv(1));
                // switch to a menu item
-               m_goto(strcat("HUD", HUD_Panel_GetName(highlightedPanel)));
+               m_goto(strcat("HUD", argv(1)));
                return;
        }
 

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index de4224b934b327f20db496198212903dc15817ad..903700d5d54d5529e174a07feb4fc9a797569c6d 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -40,5 +40,3 @@ void SUB_Null();
 float preMenuInit(); // you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded.
 void preMenuDraw(); // this is run before the menu is drawn. You may put some stuff there that has to be done every frame.
 void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
-
-float highlightedPanel;