From fbe1e0d0fbde6c4a8e8785f6dabef0bdf49d4f5e Mon Sep 17 00:00:00 2001
From: Scott Brooks <blaze@rq3.com>
Date: Sun, 2 Jun 2002 22:04:38 +0000
Subject: [PATCH] breakables act proper when triggered(explode if explosive,
 etc)  also, spawnflags 8 will make the breakable so you cant kick it

---
 reaction/game/g_misc.c   | 16 ++++++++++++++--
 reaction/game/g_weapon.c | 12 +++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/reaction/game/g_misc.c b/reaction/game/g_misc.c
index e1596f6c..c1207988 100644
--- a/reaction/game/g_misc.c
+++ b/reaction/game/g_misc.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.52  2002/06/02 22:04:38  blaze
+// breakables act proper when triggered(explode if explosive, etc)  also, spawnflags 8 will make the breakable so you cant kick it
+//
 // Revision 1.51  2002/06/02 19:22:12  blaze
 // my bad, breakables unlink when triggered now
 //
@@ -573,8 +576,17 @@ void func_breakable_die( gentity_t *self, gentity_t *inflictor, gentity_t *attac
 }
 
 void Use_Breakable( gentity_t *self, gentity_t *other, gentity_t *activator ) {
-  G_UseTargets (self, activator);  
-  func_breakable_die( self,activator,activator,self->damage,MOD_TRIGGER_HURT);
+  //G_UseTargets (self, activator);  
+//  if (self->explosive)
+//  {
+    //func_breakable_die( self,activator,activator,self->damage,MOD_TRIGGER_HURT);
+  //}
+  //else
+  //{
+  //make sure it breaks
+  self->health = 0;
+  G_BreakGlass( self, activator, activator, self->s.origin, MOD_TRIGGER_HURT, self->health );
+//  }
 }
 
 //Elder: Breakable anything!* -- we define, that is
diff --git a/reaction/game/g_weapon.c b/reaction/game/g_weapon.c
index c24cbca1..4b19dd5e 100644
--- a/reaction/game/g_weapon.c
+++ b/reaction/game/g_weapon.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.63  2002/06/02 22:04:38  blaze
+// breakables act proper when triggered(explode if explosive, etc)  also, spawnflags 8 will make the breakable so you cant kick it
+//
 // Revision 1.62  2002/05/27 06:54:06  niceass
 // new reflection code
 //
@@ -201,9 +204,16 @@ qboolean JumpKick (gentity_t *ent) {
 	//Makro - this was a few lines below
 	damage = 20;
 
-	if (traceEnt->s.eType == ET_BREAKABLE || traceEnt->client)
+  
+  if (traceEnt->s.eType == ET_BREAKABLE && (traceEnt->spawnflags & 8) == 8) 
+  {
+    return qfalse;
+  }
+
+	if ( traceEnt->s.eType == ET_BREAKABLE || traceEnt->client)
 		kickSuccess = qtrue;
 
+
 // JBravo: no kicking teammates while rounds are going
 	if (g_gametype.integer == GT_TEAMPLAY) {
 		//Makro - client check here