From: MirceaKitsune Date: Sun, 27 Feb 2011 20:44:41 +0000 (+0200) Subject: Rename cvar from fulldigest to keepdeadprey X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=9b6ee92a0f66c4ae56a09df6d39ecfaca4bd9316 Rename cvar from fulldigest to keepdeadprey --- diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index c7a47fb6..c2987426 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -1529,7 +1529,7 @@ set g_vore_soundocclusion 0.25 "directional player sounds are cut to this amount set g_vore_regurgitatecolor_release "0.4 0.6 0.1" "the color players will have when regurgitated alive" set g_vore_regurgitatecolor_release_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach" set g_vore_regurgitatecolor_digest "0.15 0.25 0" "the color players will have when digested" -set g_vore_fulldigest 1 "If enabled, prey remains inside the stomach after dying from digestion, else the predator throws up their dead body" +set g_vore_keepdeadprey 1 "If enabled, prey remains inside the stomach after dying from digestion, else the predator throws up their dead body" // part of an ugly hack for the menu audio sliders to work with the cutsound feature set menu_volume $volume diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 9706b5fc..eab85fbf 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -229,7 +229,7 @@ void Vore_Regurgitate(entity e) void Vore_DeadPrey_Configure(entity e) { - // ran when the fulldigest feature is enabled and prey stays inside the stomach after dying + // ran when the keepdeadprey feature is enabled and prey stays inside the stomach after dying if(e.fakeprey || e.predator.classname != "player") // already configured return; @@ -259,7 +259,7 @@ void Vore_DeadPrey_Detach(entity e) // ran when dead prey must be detached from the stomach (eg: they are respawning) // should only execute after Vore_DeadPrey_Configure has ran first - if not(cvar("g_vore_fulldigest")) + if not(cvar("g_vore_keepdeadprey")) return; e.fakepredator = world; @@ -271,12 +271,12 @@ void Vore_DeadPrey_Detach(entity e) void Vore_PreyRelease(entity e) { - // if the fulldigest feature is on, don't spit a dead prey's carcass out - if(e.health <= 0 && cvar("g_vore_fulldigest")) + // if the keepdeadprey feature is on, don't spit a dead prey's carcass out + if(e.health <= 0 && cvar("g_vore_keepdeadprey")) { Vore_DeadPrey_Configure(e); - // if fulldigest is enabled and the predator disconnected, detach the dead prey + // if keepdeadprey is enabled and the predator disconnected, detach the dead prey if(e.fakepredator.classname != "player") Vore_DeadPrey_Detach(e); } @@ -514,7 +514,7 @@ void Vore() // Code that addresses the prey: // -------------------------------- - // fulldigest - detach dead prey if their predator died or got swallowed + // keepdeadprey - detach dead prey if their predator died or got swallowed if(self.fakepredator.classname == "player") if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.predator.classname == "player") Vore_DeadPrey_Detach(self);