From 3448c1bff893ad3c87757604587ed7526905de34 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 24 Feb 2021 13:39:21 +1000 Subject: [PATCH] Remove the unused gender option from the profile menu --- qcsrc/common/playerstats.qc | 3 -- .../xonotic/dialog_multiplayer_profile.qc | 28 +------------------ xonotic-client.cfg | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index d90f77161..c11efed8b 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -543,7 +543,6 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) #endif url_fputs(fh, sprintf("l %s\n", cvar_string("_menu_prvm_language"))); // language url_fputs(fh, sprintf("c %s\n", cvar_string("_menu_prvm_country"))); // country - url_fputs(fh, sprintf("g %s\n", cvar_string("_cl_gender"))); // gender url_fputs(fh, sprintf("n %s\n", cvar_string("_cl_name"))); // name url_fputs(fh, sprintf("m %s %s\n", cvar_string("_cl_playermodel"), cvar_string("_cl_playerskin"))); // model/skin */url_fputs(fh, "\n"); @@ -738,7 +737,6 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) #endif url_fputs(fh, sprintf("l %s\n", cvar_string("_menu_prvm_language"))); // language //url_fputs(fh, sprintf("c %s\n", cvar_string("_cl_country"))); // country - //url_fputs(fh, sprintf("g %s\n", cvar_string("_cl_gender"))); // gender url_fputs(fh, sprintf("n %s\n", cvar_string("_cl_name"))); // name url_fputs(fh, sprintf("m %s %s\n", cvar_string("_cl_playermodel"), cvar_string("_cl_playerskin"))); // model/skin url_fputs(fh, "\n"); @@ -944,7 +942,6 @@ void PlayerInfo_ready(entity fh, entity p, float status) #ifdef MENUQC url_fputs(fh, sprintf("l %s\n", cvar_string("_menu_prvm_language"))); // language url_fputs(fh, sprintf("c %s\n", cvar_string("_menu_prvm_country"))); // country - url_fputs(fh, sprintf("g %s\n", cvar_string("_cl_gender"))); // gender url_fputs(fh, sprintf("n %s\n", cvar_string("_cl_name"))); // name url_fputs(fh, sprintf("m %s %s\n", cvar_string("_cl_playermodel"), cvar_string("_cl_playerskin"))); // model/skin #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc index e6d9e3492..ad3a3cbb5 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc @@ -149,7 +149,7 @@ void XonoticProfileTab_fill(entity me) me.gotoRC(me, 16, 3.1); me.setFirstColumn(me, me.currentColumn); // BOTTOM SECTION, TOP POS //me.gotoRC(me, 13.5, 3.1); me.setFirstColumn(me, me.currentColumn); // BOTTOM SECTION, TOP POS //me.gotoRC(me, 0.5, 3.1); me.setFirstColumn(me, me.currentColumn); // TOP SECTION, TOP POS - me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Country"))); + //me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Country"))); me.TR(me); me.TDempty(me, 0.75); @@ -161,32 +161,6 @@ void XonoticProfileTab_fill(entity me) me.TD(me, 4.5, 2, e = makeXonoticLanguageList()); // todo: cl_country: create proper country list */ - - // ================ - // GENDER SECTION - // ================ - me.gotoRC(me, 13.5, 3.1); me.setFirstColumn(me, me.currentColumn); // BOTTOM SECTION, TOP POS - //me.gotoRC(me, 19.5, 3.1); me.setFirstColumn(me, me.currentColumn); // BOTTOM SECTION, BOTTOM POS - //me.gotoRC(me, 6.5, 3.1); me.setFirstColumn(me, me.currentColumn); // TOP SECTION, BOTTOM POS - #if 0 - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gender:"))); - me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_gender")); - e.addValue(e, _("Undisclosed"), "0"); - e.addValue(e, _("Female"), "1"); - e.addValue(e, _("Male"), "2"); - e.configureXonoticTextSliderValues(e); - #else - me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Gender"))); - me.TR(me); - #define GENDERWIDTH_OFFSET 0.25 - #define GENDERWIDTH_LENGTH 2.5 - #define GENDERWIDTH_ITEM (GENDERWIDTH_LENGTH / 3) - me.TDempty(me, GENDERWIDTH_OFFSET); - me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "2", _("Female"))); - me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "1", _("Male"))); - me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "0", _("Undisclosed"))); - #endif - me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, profileApplyButton); } diff --git a/xonotic-client.cfg b/xonotic-client.cfg index 1a620e7af..4ea44c0e9 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -32,7 +32,6 @@ mod_q3bsp_lightmapmergepower 4 // player defaults _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set _cl_name "" -seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)" _cl_playerskin 0 seta cl_reticle 1 "enable zoom reticles" -- 2.39.2