From a84c2c6081e1dd0329556da8b04c6b716a7e492f Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 6 Oct 2015 21:14:11 +0100
Subject: [PATCH] Some cleanup and reordering
---
src/p_inter.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/p_inter.c b/src/p_inter.c
index af8b900409..b7f581abbc 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2920,7 +2920,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return false; // Don't hit yourself with your own paraloop, baka
if (source && source->player && !cv_friendlyfire.value
&& (gametype == GT_COOP
- || (G_GametypeHasTeams() && target->player->ctfteam == source->player->ctfteam)))
+ || (G_GametypeHasTeams() && player->ctfteam == source->player->ctfteam)))
return false; // Don't run eachother over in special stages and team games and such
}
#ifdef HAVE_BLUA
@@ -2995,7 +2995,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
else if (LUAh_MobjDamage(target, inflictor, source, damage))
return true;
#endif
- else if (!player->powers[pw_super] && (player->powers[pw_shield] || player->bot)) //If One-Hit Shield
+ else if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
{
P_ShieldDamage(player, inflictor, source, damage, damagetype);
damage = 0;
@@ -3005,22 +3005,19 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
damage = player->rings;
P_RingDamage(player, inflictor, source, damage, damagetype);
}
+ // To reduce griefing potential, don't allow players to be killed
+ // by friendly fire. Spilling their rings and other items is enough.
+ else if (!force && G_GametypeHasTeams()
+ && source && source->player && (source->player->ctfteam == player->ctfteam)
+ && cv_friendlyfire.value)
+ {
+ damage = 0;
+ P_ShieldDamage(player, inflictor, source, damage, damagetype);
+ }
else // No shield, no rings, no invincibility.
{
- // To reduce griefing potential, don't allow players to be killed
- // by friendly fire. Spilling their rings and other items is enough.
- if (force || !(G_GametypeHasTeams()
- && source && source->player && (source->player->ctfteam == player->ctfteam)
- && cv_friendlyfire.value))
- {
- damage = 1;
- P_KillPlayer(player, source, damage);
- }
- else
- {
- damage = 0;
- P_ShieldDamage(player, inflictor, source, damage, damagetype);
- }
+ damage = 1;
+ P_KillPlayer(player, source, damage);
}
if (damagetype & DMG_DEATHMASK)
--
GitLab