From a77e3b963e6bca4d58cee6dc0d191817f4416e65 Mon Sep 17 00:00:00 2001
From: katniny <okuwu1680@gmail.com>
Date: Mon, 3 Mar 2025 06:52:37 -0700
Subject: [PATCH] Add Black nuke flash
---
source/menu/menu_aces.qc | 2 +-
source/menu/menu_ctrl.qc | 3 +--
source/server/entities/powerups.qc | 6 +++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/source/menu/menu_aces.qc b/source/menu/menu_aces.qc
index a126f02..9789900 100644
--- a/source/menu/menu_aces.qc
+++ b/source/menu/menu_aces.qc
@@ -100,7 +100,7 @@ void() Menu_Accessibility =
Menu_CvarSlider(2, [0, 1, 20], "cl_textopacity", false, false);
// Nuke flash color
- Menu_Button(3, "ac_nukefla", "NUKE FLASH COLOR", "Adjust the color of the nuke flash for better visibility.") ? Menu_Accessibility_UpdateNukeFlash() : 0;
+ Menu_Button(3, "ac_nukefla", "NUKE FLASH COLOR", "Choose the color of the nuke flash.") ? Menu_Accessibility_UpdateNukeFlash() : 0;
string nukeflash_string = "";
switch(current_nukeflash) {
case 0: nukeflash_string = "WHITE"; break;
diff --git a/source/menu/menu_ctrl.qc b/source/menu/menu_ctrl.qc
index cc5d683..52a97e0 100644
--- a/source/menu/menu_ctrl.qc
+++ b/source/menu/menu_ctrl.qc
@@ -1,10 +1,9 @@
-string menu_ctrl_buttons[8] = {"cm_adsm", "cm_sens", "cm_invs", "cm_togsp", "cm_gpad", "cm_bind", "cm_apply", "cm_back"};
+string menu_ctrl_buttons[8] = {"cm_adsm", "cm_sens", "cm_invs", "cm_gpad", "cm_bind", "cm_apply", "cm_back"};
float menu_ctrl_init;
float current_adsmode;
float current_invert;
-float current_sprintoggle;
void() Menu_Control_StoreCurrentSettings =
{
diff --git a/source/server/entities/powerups.qc b/source/server/entities/powerups.qc
index a92291c..8f0364a 100644
--- a/source/server/entities/powerups.qc
+++ b/source/server/entities/powerups.qc
@@ -336,7 +336,11 @@ void() PU_NukeKill =
void() PU_Nuke =
{
// Flash the screen white
- nzp_screenflash(world, SCREENFLASH_COLOR_WHITE, 1, SCREENFLASH_FADE_INANDOUT);
+ if (cvar("cl_nukeflashcolor") == 0) {
+ nzp_screenflash(world, SCREENFLASH_COLOR_WHITE, 1, SCREENFLASH_FADE_INANDOUT);
+ } else if (cvar("cl_nukeflashcolor") == 1) {
+ nzp_screenflash(world, SCREENFLASH_COLOR_BLACK, 1, SCREENFLASH_FADE_INANDOUT);
+ }
// if there's already one active, just increment the point multiplier
if (nuke_powerup_active == true) {