From 0b50ac165e66c36128bd5435bf7adc0a0f6b1af6 Mon Sep 17 00:00:00 2001
From: Finny Merrill <griever@users.sourceforge.net>
Date: Mon, 5 Apr 2004 11:34:15 +0000
Subject: [PATCH] comment out some code that really sucks right now

---
 client.qc | 2 ++
 combat.qc | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/client.qc b/client.qc
index be6a695..32a1553 100644
--- a/client.qc
+++ b/client.qc
@@ -2853,6 +2853,7 @@ void() PlayerPreThink =
 			deathmsg = DMSG_OUTOFBOUNDS;
 			TF_T_Damage (self, NIL, NIL, self.health + 100, TF_TD_IGNOREARMOUR, TF_TD_OTHER);
 		}
+#ifdef REALLY_BUGGY_CODE
 		else if (trace_startsolid && trace_ent.classname != "force_field")
 		{
 			deathmsg = DMSG_PHYSICS;			
@@ -2892,6 +2893,7 @@ void() PlayerPreThink =
 		{
 			self.stucktime = 0;
 		}
+#endif
 	}
 	else
 	{
diff --git a/combat.qc b/combat.qc
index d56c870..ecd9973 100644
--- a/combat.qc
+++ b/combat.qc
@@ -320,6 +320,7 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags
 	}
 #endif
 
+#ifndef REALLY_BUGGY_CODE // This really really sucks
 	if (inflictor.martyr_enemy && (Teammate(attacker.team_no, targ.team_no) || Teammate(attacker.team_no,targ.real_owner.team_no)))
 	{
 		if (!Teammate(inflictor.martyr_enemy.team_no, targ.real_owner.team_no) && !Teammate(inflictor.martyr_enemy.team_no, targ.team_no))
@@ -340,6 +341,7 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags
 		    Teammate(attacker.team_no, targplayer.team_no))
 			attacker = inflictor.AIRG_FlyTracker;
 	}
+#endif
 
 	//BOOKKEEPING
 	//WK Store last person who shot martyr into .enemy