Merge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_hudpanel_timer.qc

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
index 2624a7ecd136a2419e80af1662dea5c52f9c8644..d140dea22276632a2f5fc0bb2e5c46e9761ae984 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
+#ifndef DIALOG_HUDPANEL_TIMER_H
+#define DIALOG_HUDPANEL_TIMER_H
+#include "rootdialog.qc"
+CLASS(XonoticHUDTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity))
        ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel"))
        ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
@@ -7,7 +9,7 @@ CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
        ATTRIB(XonoticHUDTimerDialog, rows, float, 15)
        ATTRIB(XonoticHUDTimerDialog, columns, float, 4)
        ATTRIB(XonoticHUDTimerDialog, name, string, "HUDtimer")
-       ATTRIB(XonoticHUDTimerDialog, requiresConnection, float, TRUE)
+       ATTRIB(XonoticHUDTimerDialog, requiresConnection, float, true)
 ENDCLASS(XonoticHUDTimerDialog)
 #endif