Make weapon display warn amount depend on weapon and ammo instead of a global cvar...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index ee55db0c99c748b77036650c9108d58098099772..5e5580c67acc54eed349319635d16a31da9e5210 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -650,8 +650,8 @@ set g_multijump 1   "Number of multiple jumps to allow (jumping again in the air),
 set g_multijump_add 0  "0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"\r
 set g_multijump_speed -125     "Minimum vertical speed a player must have in order to jump again"\r
 \r
-set g_gundisplay_warn_load 10 "display digits will show in warning mode when weapon load is below this amount"\r
-set g_gundisplay_warn_ammo 50 "display digits will show in warning mode when ammo is below this amount"\r
+set g_gundisplay_warn_weapon_grabber 10 "display digits will show in warning mode when grabber weapon load is below this amount"\r
+set g_gundisplay_warn_ammo_fuel 50 "display digits will show in warning mode when fuel ammo is below this amount"\r
 \r
 // effects\r
 r_glsl_postprocess 1\r

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 5392812c4f6a6467b1043e871ce56f031b1c0a18..c72add36e031625a72904f0abbb7f83864c4d4c0 100644 (file)
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -352,7 +352,9 @@ void W_DisplayDigitThink()
                        txt = substring(txt, self.cnt - 1, 1);\r
                }\r
 \r
-               if(self.owner.weapon_load[self.owner.weapon] <= ceil(cvar("g_gundisplay_warn_load")))\r
+               entity e;\r
+               e = get_weaponinfo(self.owner.weapon);\r
+               if(self.owner.weapon_load[self.owner.weapon] <= cvar(strcat("g_gundisplay_warn_weapon_", e.netname)))\r
                {\r
                        // in warning mode, only keep red color\r
                        if(!self.colormod)\r
@@ -366,7 +368,7 @@ void W_DisplayDigitThink()
                txt = ftos(floor(w_ammo));\r
                txt = substring(txt, self.cnt - 1, 1);\r
 \r
-               if(w_ammo <= ceil(cvar("g_gundisplay_warn_ammo")))\r
+               if(w_ammo <= cvar(strcat("g_gundisplay_warn_ammo_", Item_CounterFieldName(W_AmmoItemCode(self.owner.weapon)))))\r
                {\r
                        // in warning mode, only keep red color\r
                        if(!self.colormod)\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 8088893a06283218956fc1d39627af7c104d2d70..60f5883627cd00c2a714952af71ba52036fbb5c6 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -126,8 +126,6 @@
 \r
 - 0.7 | 0.8 BUG: Names still show for eaten players.\r
 \r
-- 0.7 | 0.8 BUG: Display digits still disappear after changing maps (but never on the first map)\r
-\r
 - 0.8: Make menu song depend on menu skin?\r
 \r
 - 0.7: Make the insides of the color vixen character glow more\r
@@ -144,8 +142,6 @@
 \r
 - 0.7 | 0.8 BUG: Bots can still senect no weapon when they have the grabber\r
 \r
-- 0.7: Fix cvar amount to use percentage for making display digits red\r
-\r
 - 0.7 | 0.8: Maybe allow damage gained from digestion to go up to 250\r
 \r
 - 0.7 | 0.8: Don't rocket prey out when the predator is dead (use a cvar for this)\r