From 516cba8b9134d3d11aa29ff8cde8d24bedf4d9fb Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Sun, 23 Jun 2002 18:29:21 +0000
Subject: [PATCH] Suicides now always gib.

---
 reaction/game/g_combat.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c
index 768cf50c..241ee82d 100644
--- a/reaction/game/g_combat.c
+++ b/reaction/game/g_combat.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.103  2002/06/23 18:29:21  jbravo
+// Suicides now always gib.
+//
 // Revision 1.102  2002/06/22 00:12:53  jbravo
 // Cleanup
 //
@@ -1456,11 +1459,15 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
 		}
 	}
 	// never gib in a nodrop
-	if ((g_RQ3_gib.integer > 3 && !self->client->gibbed
-	     && (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer))
-	    || meansOfDeath == MOD_SUICIDE) {
+	if (g_RQ3_gib.integer > 3 && !self->client->gibbed
+	     && (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer)) {
 		// gib death
 		GibEntity(self, killer);
+	} else if (meansOfDeath == MOD_SUICIDE) {
+		G_AddEvent(self, EV_GIB_PLAYER, killer);
+		self->takedamage = qfalse;
+		self->s.eType = ET_INVISIBLE;
+		self->r.contents = 0;
 	} else if (self->client->gibbed) {
 		self->client->gibbed = qtrue;	// JBravo:  Basicly do nothing
 	} else {