Merge branch 'master' into terencehill/no_damagedbycontents_when_gibbed

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index fd14d42b8d9aa4718450f3a68591d0a4a04bfc0c..784cc65e6efd6a624c0f3e9ad68b9ab0b4fbe858 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -422,6 +422,7 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
                self.alpha = -1;
                self.solid = SOLID_NOT; // restore later
                self.takedamage = DAMAGE_NO; // restore later
+               self.damagedbycontents = FALSE;
        }
 }