Merge branch 'master' into terencehill/menu_dialogs_cleanups

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
index 470fc678522c6a4f49decbdd864252512119d8d0..5805d2ea11de914382ad11beb108db1f71f60a55 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
@@ -3,41 +3,36 @@ CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticWaypointDialog, fill, void(entity))
        METHOD(XonoticWaypointDialog, showNotify, void(entity))
        ATTRIB(XonoticWaypointDialog, title, string, _("Waypoints"))
-       ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_RADAR)
-       ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.7)
+       ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_WAYPOINTS)
+       ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.5)
        ATTRIB(XonoticWaypointDialog, rows, float, 6)
-       ATTRIB(XonoticWaypointDialog, columns, float, 4)
+       ATTRIB(XonoticWaypointDialog, columns, float, 3)
 ENDCLASS(XonoticWaypointDialog)
 #endif
 
 #ifdef IMPLEMENTATION
 void XonoticWaypointDialog_showNotify(entity me)
 {
-        loadAllCvars(me);
+       loadAllCvars(me);
 }
 void XonoticWaypointDialog_fill(entity me)
 {
        entity e;
-       
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Waypoint settings:")));
+
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale"));
                                setDependent(e, "cl_hidewaypoints", 0, 0);
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Waypoint alpha:")));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint alpha:")));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
                                setDependent(e, "cl_hidewaypoints", 0, 0);
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Show names:")));
-               me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_shownames"));
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Show names:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_shownames"));
                        e.addValue(e, _("Never"), "0");
                        e.addValue(e, _("Teammates"), "1");
                        e.addValue(e, _("All players"), "2");
@@ -47,5 +42,4 @@ void XonoticWaypointDialog_fill(entity me)
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;
 }
-
 #endif