Merge remote branch 'origin/mirceakitsune/cvared_gib_health'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0a9b30cc3a4bb3d9d34256f3cf7160bfecde05b3..e9e50c5c171659d2d9a022d28a7e41dbdc698ced 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -353,6 +353,8 @@ set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the p
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
 
+set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed"
+
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
 set sv_fragmessage_information_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 66a0cf2bcfc98dd5dcc2e73b4c9f5d2435024438..d5652b775e4620b3831c96b0ae44d16ba1f737b8 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1214,6 +1214,7 @@ float autocvar_sv_warsowbunny_backtosideratio;
 float autocvar_sv_warsowbunny_topspeed;
 float autocvar_sv_warsowbunny_turnaccel;
 string autocvar_sv_weaponstats_file;
+float autocvar_sv_gibhealth;
 float autocvar_sys_ticrate;
 float autocvar_teamplay_lockonrestart;
 float autocvar_teamplay_mode;

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index f1d290a9b0ae40bccc3b03730e34820d14327739..035114b25f23a9e62b34885927e9269c6330e003 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -358,7 +358,7 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
        self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
        self.dmg_inflictor = inflictor;
 
-       if (self.health <= -150 && self.modelindex != 0)
+       if (self.health <= -autocvar_sv_gibhealth && self.modelindex != 0)
        {
                // don't use any animations as a gib
                self.frame = 0;