Merge branch 'master' into terencehill/music_player

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

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
index 5f2fc5dd747b63cf8d73589ecc90b377c59fae7f..2624a7ecd136a2419e80af1662dea5c52f9c8644 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
@@ -7,6 +7,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)
 ENDCLASS(XonoticHUDTimerDialog)
 #endif
 
@@ -19,9 +20,9 @@ void XonoticHUDTimerDialog_fill(entity me)
        DIALOG_HUDPANEL_COMMON();
 
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Timer:")));
+               me.TD(me, 1, 4, e = makeXonoticTextLabel(0, _("Timer:")));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer_increment", _("Show elapsed time")));
+               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_timer_increment", _("Show elapsed time")));
 }
 #endif