From b8748b1a371247883c859eb2aaa33c5749c1b0c0 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 19 Dec 2013 22:56:36 -0500 Subject: [PATCH] Fix a small problem with teams slider --- qcsrc/common/util.qc | 2 -- qcsrc/common/util.qh | 3 +-- qcsrc/menu/xonotic/dialog_multiplayer_create.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index dcf1142c4..2cfdbfd67 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -2575,7 +2575,6 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t } // todo: this sucks, lets find a better way to do backtraces? -#ifndef MENUQC void backtrace(string msg) { float dev, war; @@ -2597,7 +2596,6 @@ void backtrace(string msg) cvar_set("developer", ftos(dev)); cvar_set("prvm_backtraceforwarnings", ftos(war)); } -#endif // color code replace, place inside of sprintf and parse the string string CCR(string input) diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 3cb3b35d2..f16cd9318 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -368,9 +368,8 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t // expand multiple arguments into one argument by stripping parenthesis #define XPD(...) __VA_ARGS__ -#ifndef MENUQC void backtrace(string msg); -#endif + // color code replace, place inside of sprintf and parse the string... defaults described as constants // foreground/normal colors diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c index dfdc046db..5ae278d3e 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c @@ -206,9 +206,9 @@ void XonoticServerCreateTab_gameTypeChangeNotify(entity me) default: x = FALSE; e.configureXonoticTextSlider(e, string_null); break; } e.configureXonoticTextSliderValues(e); - e.setText(e, _("Default")); + e.value = 0; me.sliderTeams.disabled = me.labelTeams.disabled = !x; - + me.mapListBox.refilter(me.mapListBox); } -- 2.39.2