Same thing in player_setupanimsformodel(), to fix legacy animation issues

[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 740cc6a9ee6a6b5042843fcf20e1e63c19af77a5..3e6c69df8020233ff1eb84130d48b3910e92d36a 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -104,7 +104,9 @@ void WeaponStats_LogKill(float awep, float vwep)
 void CopyBody(float keepvelocity)\r
 {\r
        local entity oldself;\r
-       if (self.effects & EF_NODRAW)\r
+       if (self.fakeprey)\r
+               return;\r
+       if (self.effects & EF_NODRAW || self.alpha < 0)\r
                return;\r
        oldself = self;\r
        self = spawn();\r
@@ -216,6 +218,10 @@ float player_getspecies()
 \r
 void player_setupanimsformodel()\r
 {\r
+       // if this is the stomach model (or any model that can't be animated), don't attempt to animate\r
+       if(substring(self.model, strlen(self.model) - 3, 3) == "md3") // check model extension\r
+               return;\r
+\r
        local string animfilename;\r
        local float animfile;\r
        // defaults for legacy .zym models without animinfo files\r
@@ -290,6 +296,10 @@ void player_setupanimsformodel()
 \r
 void player_anim (void)\r
 {\r
+       // if this is the stomach model (or any model that can't be animated), don't attempt to animate\r
+       if(substring(self.model, strlen(self.model) - 3, 3) == "md3") // check model extension\r
+               return;\r
+\r
        updateanim(self);\r
        if (self.weaponentity)\r
                updateanim(self.weaponentity);\r
@@ -355,9 +365,9 @@ void player_anim (void)
                setanim(self.weaponentity, self.weaponentity.anim_idle, TRUE, FALSE, FALSE);\r
 }\r
 \r
-void SpawnThrownWeapon (vector org, float w)\r
+void SpawnThrownWeapon (vector org, float w, float doreduce)\r
 {\r
-       W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, FALSE);\r
+       W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, doreduce);\r
 }\r
 \r
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)\r
@@ -393,13 +403,14 @@ 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
        self.dmg_inflictor = inflictor;\r
 \r
-       if (self.health <= -75 && self.modelindex != 0)\r
+       if (self.health <= -cvar("sv_gibhealth") && self.modelindex != 0)\r
        {\r
                // don't use any animations as a gib\r
                self.frame = 0;\r
@@ -470,7 +481,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
@@ -486,14 +498,17 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                                        }\r
 \r
                                        if(sound_allowed(MSG_BROADCAST, attacker))\r
+                                       if(self.health > 1)\r
                                        {\r
-                                               if(self.health > 75) // TODO make a "gentle" version?\r
+                                               if(deathtype == DEATH_FALL)\r
+                                                       PlayerSound(self, playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+                                               else if(self.health > 75) // TODO make a "gentle" version?\r
                                                        PlayerSound(self, playersound_pain100, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
                                                else if(self.health > 50)\r
                                                        PlayerSound(self, playersound_pain75, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
                                                else if(self.health > 25)\r
                                                        PlayerSound(self, playersound_pain50, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
-                                               else if(self.health > 1)\r
+                                               else\r
                                                        PlayerSound(self, playersound_pain25, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
                                        }\r
                                }\r
@@ -586,7 +601,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                // clear selected player display\r
                ClearSelectedPlayer();\r
                // throw a weapon\r
-               SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);\r
+               SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, FALSE);\r
                // print an obituary message\r
                Obituary (attacker, inflictor, self, deathtype);\r
                race_PreDie();\r
@@ -751,7 +766,7 @@ void UpdateSelectedPlayer()
                if(!self.dropweapon_check)\r
                if(self.predator.team != self.team) // don't disarm team mates when swallowing them\r
                if(random() < cvar("g_balance_vore_swallow_dropweapon"))\r
-                       SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);\r
+                       SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, TRUE);\r
                self.dropweapon_check = TRUE;\r
        }\r
        else\r
@@ -1287,17 +1302,15 @@ void GlobalSound(string sample, float chan, float voicetype)
                        tauntrand = random();\r
                        FOR_EACH_REALCLIENT(msg_entity)\r
                                if (tauntrand < msg_entity.cvar_cl_autotaunt)\r
+                               if (msg_entity.cvar_cl_voice_directional >= 1)\r
                                {\r
-                                       if (msg_entity.cvar_cl_voice_directional >= 1)\r
-                                       {\r
-                                               if(self.predator.classname == "player")\r
-                                                       soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE * bound(0, cvar("g_vore_soundocclusion"), 1), bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));\r
-                                               else\r
-                                                       soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));\r
-                                       }\r
+                                       if(self.predator.classname == "player")\r
+                                               soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE * bound(0, cvar("g_vore_soundocclusion"), 1), bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));\r
                                        else\r
-                                               soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);\r
+                                               soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));\r
                                }\r
+                               else\r
+                                       soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);\r
                        break;\r
                case VOICETYPE_TAUNT:\r
                        if(self.classname == "player")\r