Merge branch 'master' into Mario/waterjump_fix

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

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
index b8ecbee59bcb49bd555eb636e6294d5c59801217..dec6fe364493c2edd26828edd9ae626caee1e898 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
@@ -1,22 +1,13 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog)
-       METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
-       ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel"))
-       ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15)
-       ATTRIB(XonoticHUDRaceTimerDialog, columns, float, 4)
-       ATTRIB(XonoticHUDRaceTimerDialog, name, string, "HUDracetimer")
-       ATTRIB(XonoticHUDRaceTimerDialog, requiresConnection, float, true)
-ENDCLASS(XonoticHUDRaceTimerDialog)
-#endif
+#include "dialog_hudpanel_racetimer.qh"
+
+#include "checkbox.qh"
 
-#ifdef IMPLEMENTATION
 void XonoticHUDRaceTimerDialog_fill(entity me)
 {
-       entity e;
+       //entity e;
        string panelname = "racetimer";
 
-       DIALOG_HUDPANEL_COMMON();
+       dialog_hudpanel_main_checkbox(me, panelname);
+
+       dialog_hudpanel_main_settings(me, panelname);
 }
-#endif