From: Rudolf Polzer Date: Sun, 1 Jan 2012 20:14:39 +0000 (+0100) Subject: to the menu X-Git-Tag: xonotic-v0.6.0~189^2~6^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd05d36d3ff5205d1c33689d73119a3010ac3f31;p=xonotic%2Fxonotic-data.pk3dir.git to the menu --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index e740d2f04..f8a668166 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1921,7 +1921,7 @@ set g_debug_bot_commands 0 "print scripted bot commands before executing" set g_debug_defaultsounds 0 "always use default sounds" set sv_use_csqc_players 1 "set to 0 to disable CSQC players for better Xonotic 0.5 compat" set cl_forceplayermodels 0 "set to 1 to make everyone look like your own model (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)" -set cl_forceplayercolors 0 "set to 1 to make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)" +set cl_forceplayercolors 0 "set to 1 to make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0, and is ignored in teamplay)" set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime" // debug cvars for keyhunt attaching diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index d4211de0b..fde65aa5e 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -64,13 +64,13 @@ void XonoticPlayerSettingsTab_fill(entity me) 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 + 3), 1.8, 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; + m = me.rows - (r + 4); n = 16 - !cvar("developer"); m = m / (n - 1); for(i = 0; i < n; ++i) @@ -83,8 +83,10 @@ void XonoticPlayerSettingsTab_fill(entity me) me.gotoRC(me, r + i * m, 0.4); me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0'); } - me.gotoRC(me, me.rows - 2, 0); + me.gotoRC(me, me.rows - 3, 0); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine"))); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayercolors", _("Force player colors to mine"))); me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Field of view:")));