Merge remote branch 'refs/remotes/origin/mirceakitsune/death_unglow'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d42b8649c1b225d1900787c35856dadce2d943b7..5c76f7df8a867325f7863f0293861bd74d61fa5d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -849,6 +849,8 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 0      "serverside footstep sounds"
 
+set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"
+
 // effects
 r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints)
 r_mipsprites 1

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 08c53c19403bc819372fbe97c3138750f236e5bc..1543ac156187e0f4c2497ca2b203dfc71293a5b6 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2599,7 +2599,23 @@ void PlayerPreThink (void)
 
                if(frametime)
                {
-                       self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
+                       if(self.health <= 0 && cvar("g_deathglow"))
+                       {
+                               if(self.glowmod_x > 0)
+                                       self.glowmod_x -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_x = -1;
+                               if(self.glowmod_y > 0)
+                                       self.glowmod_y -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_y = -1;
+                               if(self.glowmod_z > 0)
+                                       self.glowmod_z -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_z = -1;
+                       }
+                       else
+                               self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
                        player_powerups();
                }