Separate health and armor regen pauses

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

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 932d0b96058e6b9daef3a21bec571518a8ed82aa..45bb087aac07774ba84a20a19117d4aa849f1d63 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -393,7 +393,8 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
                self.armorvalue = self.armorvalue - save;\r
                self.health = self.health - take;\r
                // pause regeneration for 5 seconds\r
-               self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));\r
+               self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_health_regen"));\r
+               self.pauseregenarmor_finished = max(self.pauseregenarmor_finished, time + cvar("g_balance_pause_armor_regen"));\r
        }\r
        self.dmg_save = self.dmg_save + save;//max(save - 10, 0);\r
        self.dmg_take = self.dmg_take + take;//max(take - 10, 0);\r
@@ -470,7 +471,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                        self.armorvalue = self.armorvalue - save;\r
                        self.health = self.health - take;\r
                        // pause regeneration for 5 seconds\r
-                       self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));\r
+                       self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_health_regen"));\r
+                       self.pauseregenarmor_finished = max(self.pauseregenarmor_finished, time + cvar("g_balance_pause_armor_regen"));\r
 \r
                        if (time > self.pain_finished)          //Don't switch pain sequences like crazy\r
                        {\r