move highlightedPanel updating to gamecode.qc to prepare for a little restructure...

diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc
index 94357b2270ed928ac907c7676be41147b03cd5f5..971cfa243d04c0657726b27f98e1f8d11fb37fc8 100644 (file)
--- a/qcsrc/menu/gamecommand.qc
+++ b/qcsrc/menu/gamecommand.qc
@@ -64,11 +64,14 @@ void GameCommand(string theCommand)
 
        if(argv(0) == "directpanelhudmenu")
        {
+               highlightedPanel = stof(argv(1));
                // switch to a menu item
                m_goto("HUDOptions");
+
+               // this is here to detect which id the HUDOptions dialog is, i could imagine you need a similar system for the per-panel dialogs...
                entity panelvar;
                panelvar = findstring(NULL, name, "HUDOptions");
-               panelvar.change(panelvar, stof(argv(1)));
+               panelvar.change(panelvar);
                return;
        }
 

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_options.c b/qcsrc/menu/xonotic/dialog_hudpanel_options.c
index 306142a984c5eff6e0ba0dee75044c16f88e0d23..02dec282c6fc0731a8b043f295711c8b5fe81466 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_options.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_options.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDOptionsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDOptionsDialog, fill, void(entity))
-       METHOD(XonoticHUDOptionsDialog, change, void(entity, float))
+       METHOD(XonoticHUDOptionsDialog, change, void(entity))
        ATTRIB(XonoticHUDOptionsDialog, title, string, "HUD Setup")
        ATTRIB(XonoticHUDOptionsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDOptionsDialog, intendedWidth, float, 0.4)
@@ -52,12 +52,9 @@ void loadCvarsXonoticHUDOptionsDialog(entity me)
 }
 */
 
-void changeXonoticHUDOptionsDialog(entity me, float id)
+void changeXonoticHUDOptionsDialog(entity me)
 {
        loadAllCvars(me);
-       highlightedPanel = id;
-       print("Yay!", ftos(id), "\n");
-
 }
 
 #endif