Fix compilation

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 3989d1edb7ac83eaae44e976d214b32865adc079..05084e00c054ef0585627c261689d864f17b5e0b 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -632,14 +632,6 @@ void HUD_Panel_Arrow_Action(float nPrimary)
        }
 }
 
-const int S_MOUSE1 = 1;
-const int S_MOUSE2 = 2;
-const int S_MOUSE3 = 4;
-int mouseClicked;
-int prevMouseClicked; // previous state
-float prevMouseClickedTime; // time during previous left mouse click, to check for doubleclicks
-vector prevMouseClickedPos; // pos during previous left mouse click, to check for doubleclicks
-
 void HUD_Panel_EnableMenu();
 entity tab_panels[HUD_PANEL_MAX];
 entity tab_panel;

diff --git a/qcsrc/client/hud_config.qh b/qcsrc/client/hud_config.qh
index cc1d4d563c6048c7d7fd0a07d0369a9e18a69dbe..9a8a46a3c887f4a2b350ea5cf3428f07b5ab8224 100644 (file)
--- a/qcsrc/client/hud_config.qh
+++ b/qcsrc/client/hud_config.qh
@@ -1,6 +1,15 @@
 #ifndef HUD_CONFIG_H
 #define HUD_CONFIG_H
 
+const int S_MOUSE1 = 1;
+const int S_MOUSE2 = 2;
+const int S_MOUSE3 = 4;
+int mouseClicked;
+int prevMouseClicked; // previous state
+float prevMouseClickedTime; // time during previous left mouse click, to check for doubleclicks
+vector prevMouseClickedPos; // pos during previous left mouse click, to check for doubleclicks
+
+
 void HUD_Panel_ExportCfg(string cfgname);
 
 void HUD_Panel_Mouse();

diff --git a/qcsrc/client/quickmenu.qc b/qcsrc/client/quickmenu.qc
index 3a243d07e29c36726166db53326f1631d2a44b6c..5dd2790b9002522bb1eb1baad812db713124bbb7 100644 (file)
--- a/qcsrc/client/quickmenu.qc
+++ b/qcsrc/client/quickmenu.qc
@@ -1,3 +1,9 @@
+#include "_all.qh"
+
+#include "hud_config.qh"
+
+#include "../dpdefs/keycodes.qh"
+
 // QUICKMENU_MAXLINES must be <= 10
 const int QUICKMENU_MAXLINES = 10;
 // visible entries are loaded from QuickMenu_Buffer into QuickMenu_Page_* arrays

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc
index 16c33373e01b64f14ee9ba3c44bc9acfaa90ca14..32aa6f7d532b5f85a31cbd03e4e362b07f090a1c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDQuickMenuDialog) EXTENDS(XonoticRootDialog)
+#ifndef DIALOG_HUDPANEL_QUICKMENU_H
+#define DIALOG_HUDPANEL_QUICKMENU_H
+#include "rootdialog.qc"
+CLASS(XonoticHUDQuickMenuDialog, XonoticRootDialog)
        METHOD(XonoticHUDQuickMenuDialog, fill, void(entity))
        ATTRIB(XonoticHUDQuickMenuDialog, title, string, _("Quick Menu Panel"))
        ATTRIB(XonoticHUDQuickMenuDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index fd76fcf89e474bda2b2649d2f6abab8974fba7f4..34fb7d10b2dcb95bdbb814cdbb8dfd7461e9f214 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -136,7 +136,7 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDQuickMenuDialog();
+       i = NEW(XonoticHUDQuickMenuDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);