From c080d71f168dc6b809563e0eeb61ae0c3b5b76de Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sat, 12 Jun 2010 00:28:11 +0300 Subject: [PATCH] move highlightedPanel updating to gamecode.qc to prepare for a little restructure... --- qcsrc/menu/gamecommand.qc | 5 ++++- qcsrc/menu/xonotic/dialog_hudpanel_options.c | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc index 94357b227..971cfa243 100644 --- 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 306142a98..02dec282c 100644 --- 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 -- 2.39.2