From e0d194afa6b7ccd627c1889a265f9f2272fdbd0a Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 25 Jul 2012 10:11:54 +0200 Subject: [PATCH] player color selector adjustments as suggested by Morphed (http://rm.sudo.rm-f.org/img/uploaded/19393fb26967e8171a77adc6e65f4b76.jpg) --- .../xonotic/dialog_multiplayer_playersetup.c | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index d33a1eab1..156ba378f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -54,34 +54,38 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TR(me); me.TR(me); me.TR(me); + + me.TR(me); + me.TDempty(me, 1); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Model:"))); me.TR(me); - me.gotoRC(me, 8, 0.0); + me.TDempty(me, 1); pms = makeXonoticPlayerModelSelector(); - me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Model:"))); me.TD(me, 1, 0.3, e = makeXonoticButton("<<", '0 0 0')); e.onClick = PlayerModelSelector_Prev_Click; e.onClickEntity = pms; - me.TD(me, me.rows - (me.currentRow + 2), 1.8, pms); + me.TD(me, me.rows - (me.currentRow + 2), 1.4, pms); me.TD(me, 1, 0.3, e = makeXonoticButton(">>", '0 0 0')); e.onClick = PlayerModelSelector_Next_Click; e.onClickEntity = pms; me.TR(me); - r = me.currentRow; - m = me.rows - (r + 3); - n = 16 - !cvar("developer"); - m = m / (n - 1); - for(i = 0; i < n; ++i) + me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color:"))); + for(i = 0; i < 15; ++i) { - me.gotoRC(me, r + i * m, 0.1); - me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0'); + if(mod(i, 5) == 0) + me.TR(me); + me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0'); } - for(i = 0; i < n; ++i) + me.TR(me); + me.TR(me); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color:"))); + for(i = 0; i < 15; ++i) { - me.gotoRC(me, r + i * m, 0.4); - me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0'); + if(mod(i, 5) == 0) + me.TR(me); + me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0'); } - // crosshair_enabled: 0 = no crosshair options, 1 = no crosshair selection, but everything else enabled, 2 = all crosshair options enabled // FIXME: In the future, perhaps make one global crosshair_type cvar which has 0 for disabled, 1 for custom, 2 for per weapon, etc? me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); -- 2.39.2