From 5fdc63156596340325f62f30fdf1841396c4e693 Mon Sep 17 00:00:00 2001 From: NeonKnightOA Date: Wed, 20 Mar 2024 16:51:59 +0000 Subject: [PATCH] Revert attempt to gray out "Weapon Arena Weapon" that didn't take. (#242) --- CHANGELOG.md | 5 +---- code/q3_ui/ui_preferences.c | 18 +++++++++--------- code/q3_ui/ui_startserver.c | 10 +++------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9332392..feed7267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,7 +36,7 @@ * `elimination_selfdamage` can now be set in the UI for Elimination and eCTF matches. * `g_grapple` can now be set for all match types. * `g_harvesterFromBodies` can now be set for Harvester matches. - * `g_weaponArenaWeapon` can be selectable in Classic UI, but it needs "Single Weapon Arena" to be set before (it's grayed out if this isn't the case). + * `g_weaponArenaWeapon` can be selectable in Classic UI, but it needs "Single Weapon Arena" to be set before. * `cg_muzzleFlashStyle` can now be chosen in Classic UI under "Game Options". * Separated "Allow Downloads From Servers" and "Allow Downloads To Clients". The former is a player option (`cl_allowDownload 0/1`) and can be set in "Options -> Network" (formerly in "Game Options"), while the latter a server option (`sv_allowDownload 0/1`) and can be set from "Create Server". The option names were changed to reflect these changes. * "Delag Hitscan" was moved from "Game Options" to "Network". @@ -45,7 +45,6 @@ * `g_ddCaptureTime` and `g_ddRespawnDelay` were added for Double Domination matches. * `cg_obituaryOutput` can now be configured in "Game Options" as "Death Messages". * New option in Skirmish/Create Server, "Weapon Ruleset", allows picking up one of five weapon rulesets: All Weapons (Standard) -default-, Instantgib, Single Weapon Arena, Classic Mode -replaces NG, CG, PL, Kami, Invul and Runes with equivalents- and All Weapons (Elimination). - * `cg_crosshairColorRed`, `cg_crosshairColorGreen` and `cg_crosshairColorBlue` are grayed out in "Game Options" if `cg_crosshairHealth` is set. * Now it's possible to compile OAX on Mac (thanks EddieBrrrock!) * AI enhancements: * Holdable (Personal Teleporter/Medkit/Kamikaze/Invulnerability) handling. @@ -73,8 +72,6 @@ **Release date:** TBA -* `cg_crosshairColorRed`, `cg_crosshairColorGreen` and `cg_crosshairColorBlue` are grayed out in "Game Options" if `cg_crosshairHealth` is set. -* `g_weaponArenaWeapon` is grayed out in Classic UI if the selected Weapon Ruleset isn't "Single Weapon Arena". * Classic UI: `cg_obituaryOutput` can now be configured in "Game Options" as "Death Messages". * Deletion of `g_runes`. In its place there's a new cvar, `g_classicMode`. Enabling it (via cvar or the Weapon Ruleset "Classic Arena" in Skirmish/Create Server) makes the following replacements: * Nailgun and ammo with Shotgun and Shells. diff --git a/code/q3_ui/ui_preferences.c b/code/q3_ui/ui_preferences.c index 439b276b..7b2d27ad 100644 --- a/code/q3_ui/ui_preferences.c +++ b/code/q3_ui/ui_preferences.c @@ -184,14 +184,14 @@ static void Preferences_Event( void* ptr, int notification ) { trap_Cvar_SetValue( "cg_crosshairHealth", s_preferences.crosshairHealth.curvalue ); if(s_preferences.crosshairHealth.curvalue) { //If crosshairHealth is on: Don't allow color selection - s_preferences.crosshairColorRed.generic.flags |= QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorGreen.generic.flags |= QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorBlue.generic.flags |= QMF_INACTIVE|QMF_GRAYED; + s_preferences.crosshairColorRed.generic.flags |= QMF_INACTIVE; + s_preferences.crosshairColorGreen.generic.flags |= QMF_INACTIVE; + s_preferences.crosshairColorBlue.generic.flags |= QMF_INACTIVE; } else { //If crosshairHealth is off: Allow color selection - s_preferences.crosshairColorRed.generic.flags &= ~QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorGreen.generic.flags &= ~QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorBlue.generic.flags &= ~QMF_INACTIVE|QMF_GRAYED; + s_preferences.crosshairColorRed.generic.flags &= ~QMF_INACTIVE; + s_preferences.crosshairColorGreen.generic.flags &= ~QMF_INACTIVE; + s_preferences.crosshairColorBlue.generic.flags &= ~QMF_INACTIVE; } break; @@ -435,9 +435,9 @@ static void Preferences_MenuInit( void ) { if(s_preferences.crosshairHealth.curvalue) { - s_preferences.crosshairColorRed.generic.flags |= QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorGreen.generic.flags |= QMF_INACTIVE|QMF_GRAYED; - s_preferences.crosshairColorBlue.generic.flags |= QMF_INACTIVE|QMF_GRAYED; + s_preferences.crosshairColorRed.generic.flags |= QMF_INACTIVE; + s_preferences.crosshairColorGreen.generic.flags |= QMF_INACTIVE; + s_preferences.crosshairColorBlue.generic.flags |= QMF_INACTIVE; } y += BIGCHAR_HEIGHT+2; diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c index 2268fa34..ba155a93 100644 --- a/code/q3_ui/ui_startserver.c +++ b/code/q3_ui/ui_startserver.c @@ -2049,7 +2049,7 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) { else /* if(UI_GametypeUsesCaptureLimit(s_serveroptions.gametype)) */ { s_serveroptions.capturelimit.generic.type = MTYPE_FIELD; if (UI_IsARoundBasedGametype(s_serveroptions.gametype)) { - s_serveroptions.capturelimit.generic.name = "Score Limit:"; + s_serveroptions.capturelimit.generic.name = "Round Limit:"; } else { s_serveroptions.capturelimit.generic.name = "Capture Limit:"; @@ -2103,21 +2103,17 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) { } s_serveroptions.weaponMode.generic.name = "Weapons Ruleset:"; s_serveroptions.weaponMode.generic.statusbar = ServerOptions_StatusBar_WeaponMode; - + //Weapon Arena Weapon list y += BIGCHAR_HEIGHT+2; s_serveroptions.weaponArenaWeapon.generic.type = MTYPE_SPINCONTROL; s_serveroptions.weaponArenaWeapon.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT; - s_serveroptions.weaponArenaWeapon.generic.name = "Weapon Arena Weapon:"; + s_serveroptions.weaponArenaWeapon.generic.name = "SWA Mode Weapon:"; s_serveroptions.weaponArenaWeapon.generic.x = OPTIONS_X; s_serveroptions.weaponArenaWeapon.generic.y = y; s_serveroptions.weaponArenaWeapon.itemnames = weaponArenaWeapon_list; s_serveroptions.weaponArenaWeapon.generic.statusbar = ServerOptions_StatusBar_WeaponArenaWeapon; - if(s_serveroptions.weaponMode.curvalue != 2) { - s_serveroptions.weaponArenaWeapon.generic.flags |= QMF_INACTIVE|QMF_GRAYED; - } - y += BIGCHAR_HEIGHT+2; s_serveroptions.grapple.generic.type = MTYPE_RADIOBUTTON; s_serveroptions.grapple.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;