From 2671dcbe85ad0122d0ab0fe63c73443ab5ccf6d1 Mon Sep 17 00:00:00 2001
From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 22:24:35 +1000
Subject: [PATCH] Allow turning off damage from lava and slime in instagib, as
it used to be
---
mutators.cfg | 1 +
qcsrc/server/autocvars.qh | 1 +
qcsrc/server/mutators/mutator_instagib.qc | 21 ++++++++++++++-------
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/mutators.cfg b/mutators.cfg
index 311debc2c0..10a41a0693 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -31,6 +31,7 @@ set g_instagib_ammo_start 10 "starting ammo"
set g_instagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
set g_instagib_invis_alpha 0.15
set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
+set g_instagib_damagedbycontents 1 "allow damage from lava pits in instagib"
// ==========
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 3f4a11a7ce..3783ee4195 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -402,6 +402,7 @@ int autocvar_g_instagib_ammo_drop;
int autocvar_g_instagib_extralives;
float autocvar_g_instagib_speed_highspeed;
float autocvar_g_instagib_invis_alpha;
+bool autocvar_g_instagib_damagedbycontents = true;
#define autocvar_g_mirrordamage cvar("g_mirrordamage")
#define autocvar_g_mirrordamage_virtual cvar("g_mirrordamage_virtual")
diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 9728ed623b..2e76d700e1 100644
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -249,12 +249,17 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerDamage)
if(IS_PLAYER(frag_target))
{
- if ((frag_deathtype == DEATH_FALL) ||
- (frag_deathtype == DEATH_DROWN) ||
- (frag_deathtype == DEATH_SLIME) ||
- (frag_deathtype == DEATH_LAVA))
+ if(frag_deathtype == DEATH_FALL)
+ frag_damage = 0; // never count fall damage
+
+ if(!autocvar_g_instagib_damagedbycontents)
+ switch(frag_deathtype)
{
- frag_damage = 0;
+ case DEATH_DROWN:
+ case DEATH_SLIME:
+ case DEATH_LAVA:
+ frag_damage = 0;
+ break;
}
if(IS_PLAYER(frag_attacker))
@@ -335,11 +340,13 @@ MUTATOR_HOOKFUNCTION(instagib_FilterItem)
if(self.weapon == WEP_DEVASTATOR.m_id || self.weapon == WEP_VORTEX.m_id)
{
- entity e = spawn();
+ entity e = spawn(), oldself;
setorigin(e, self.origin);
- entity oldself;
oldself = self;
self = e;
+ self.noalign = oldself.noalign;
+ self.cnt = oldself.cnt;
+ self.team = oldself.team;
spawnfunc_item_minst_cells();
self = oldself;
return true;
--
2.39.5