Merge remote-tracking branch 'origin/mrbougo/clonefixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 17569147fb091d9e08f9ee4ea7e877287c69f34d..3ff7f9166ee05cd19d86fe4bbcf37cfc29f04b7c 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -91,6 +91,7 @@ void CopyBody(float keepvelocity)
        self.nextthink = time;
        self.think = CopyBody_Think;
        // "bake" the current animation frame for clones (they don't get clientside animation)
+       animdecide_init(self);
        animdecide_setframes(self, FALSE, frame, frame1time, frame2, frame2time);
 
        self = oldself;
@@ -535,7 +536,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                }
 
                // print an obituary message
-               Obituary (attacker, inflictor, self, deathtype);
+               if(self.classname != "body")
+                       Obituary (attacker, inflictor, self, deathtype);
 
         // increment frag counter for used weapon type
         float w;
@@ -563,7 +565,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 
                // player could have been miraculously resuscitated ;)
                // e.g. players in freezetag get frozen, they don't really die
-               if(self.health >= 1 || !IS_PLAYER(self))
+               if(self.health >= 1 || !(IS_PLAYER(self) || self.classname == "body"))
                        return;
 
                // when we get here, player actually dies
@@ -615,6 +617,14 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                // set up to fade out later
                SUB_SetFade (self, time + 6 + random (), 1);
 
+               // reset body think wrapper broken by SUB_SetFade
+               if(self.classname == "body" && self.think != CopyBody_Think) {
+                       self.CopyBody_think = self.think;
+                       self.CopyBody_nextthink = self.nextthink;
+                       self.think = CopyBody_Think;
+                       self.nextthink = time;
+               }
+
                if(autocvar_sv_gentle > 0 || autocvar_ekg) {
                        // remove corpse
                        PlayerCorpseDamage (inflictor, attacker, autocvar_sv_gibhealth+1.0, deathtype, hitloc, force);