1 files changed, 14 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 0715266d..f8866871 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -978,8 +978,21 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
     // if the attacker was on the same team
     if( targ != attacker && OnSameTeam( targ, attacker ) )
     {
+      // if dretchpunt is enabled and this is a dretch, do dretchpunt instead of damage
+      if( g_dretchPunt.integer &&
+          targ->client->ps.stats[ STAT_CLASS ] == PCL_ALIEN_LEVEL0 )
+      {
+          vec3_t dir, push;
+
+          VectorSubtract( targ->r.currentOrigin, attacker->r.currentOrigin, dir );
+          VectorNormalizeFast( dir );
+          VectorScale( dir, ( damage * 10.0f ), push );
+          push[2] = 64.0f;
+          VectorAdd( targ->client->ps.velocity, push, targ->client->ps.velocity );
+          return;
+      }
       // don't do friendly fire on movement attacks
-      if( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE ||
+      else if( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE ||
           mod == MOD_LEVEL4_CRUSH )
         return;