Adapt the coloring system in Xonotic. The second player color will no longer be pants...

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 85138812266dc178a754a4cc478c7874d67d7446..ec685f36ecdebff6b1b45794e283b04cf50fc88f 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -530,10 +530,10 @@ float Client_customizeentityforclient()
        Client_setmodel(setmodel_state());\r
        if not(self.stat_eaten || self.fakeprey)\r
                self.alpha = default_player_alpha;\r
-       else if(self.predator == other.predator && self != other && !(other.cvar_chase_active || other.classname == "observer"))\r
-               self.alpha = default_player_alpha;\r
+       else if(cvar("g_vore_neighborprey_distance") && !self.fakeprey && (self.predator == other.predator || self.predator == other.fakepredator) && !(other.cvar_chase_active || other.classname == "observer"))\r
+               self.alpha = default_player_alpha; // allow seeing neighboring prey\r
        else\r
-               self.alpha = -1; // hide all prey\r
+               self.alpha = -1; // hide prey\r
        return TRUE;\r
 }\r
 \r
@@ -2277,30 +2277,36 @@ float vercmp(string v1, string v2)
        return vercmp_recursive(v1, v2);\r
 }\r
 \r
-void ApplyHealthSize()\r
+void SetPlayerSize()\r
 {\r
-       // change player scale based on the amount of health we have\r
-\r
-       if not(cvar("g_healthsize"))\r
-               return;\r
+       if(cvar("g_healthsize"))\r
+       {\r
+               // change player scale based on the amount of health we have\r
 \r
-       self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");\r
+               self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");\r
 \r
-       // The following code sets the bounding box to match the player's size.\r
-       // It is currently disabled because of issues with engine movement prediction (cl_movement).\r
-       // The engine expects the bounding box to be default size, and changing it will cause glitches.\r
-       // This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.\r
-       if(self.crouch)\r
-       {\r
-               //setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);\r
-               if(!self.stat_eaten)\r
-                       self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;\r
+               // The following code sets the bounding box to match the player's size.\r
+               // It is currently disabled because of issues with engine movement prediction (cl_movement).\r
+               // The engine expects the bounding box to be default size, and changing it will cause glitches.\r
+               // This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.\r
+               if(self.crouch)\r
+               {\r
+                       //setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);\r
+                       if(!self.stat_eaten)\r
+                               self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;\r
+               }\r
+               else\r
+               {\r
+                       //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);\r
+                       if(!self.stat_eaten)\r
+                               self.view_ofs = PL_VIEW_OFS * self.scale;\r
+               }\r
        }\r
-       else\r
+\r
+       if(self.stat_eaten && cvar("g_vore_neighborprey_distance"))\r
        {\r
-               //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);\r
-               if(!self.stat_eaten)\r
-                       self.view_ofs = PL_VIEW_OFS * self.scale;\r
+               // resize prey if neighborprey is enabled\r
+               self.scale *= cvar("g_vore_neighborprey_scale");\r
        }\r
 }\r
 \r
@@ -2492,6 +2498,29 @@ void PlayerPreThink (void)
 \r
                if(frametime)\r
                {\r
+\r
+                       if(self.health <= 0 && cvar("g_deathglow"))\r
+                       {\r
+                               if(self.glowmod_x > 0)\r
+                                       self.glowmod_x -= cvar("g_deathglow") * frametime;\r
+                               else\r
+                                       self.glowmod_x = -1;\r
+                               if(self.glowmod_y > 0)\r
+                                       self.glowmod_y -= cvar("g_deathglow") * frametime;\r
+                               else\r
+                                       self.glowmod_y = -1;\r
+                               if(self.glowmod_z > 0)\r
+                                       self.glowmod_z -= cvar("g_deathglow") * frametime;\r
+                               else\r
+                                       self.glowmod_z = -1;\r
+                       }\r
+                       else\r
+                       {\r
+                               // set weapon and player glowmod\r
+                               self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;\r
+                               self.weaponentity_glowmod = self.glowmod;\r
+                       }\r
+\r
                        player_powerups();\r
                }\r
 \r
@@ -2626,7 +2655,7 @@ void PlayerPreThink (void)
                        }\r
                }\r
 \r
-               ApplyHealthSize();\r
+               SetPlayerSize();\r
 \r
                FixPlayermodel();\r
 \r