rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

breakables act proper when triggered(explode if explosive, etc) also, spawnflags 8 will make the breakable so you cant kick it

This commit is contained in:
Scott Brooks 2002-06-02 22:04:38 +00:00
parent e3061e75fa
commit fbe1e0d0fb
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
reaction/game/g_misc.c
View File

@ -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

12
reaction/game/g_weapon.c
View File

@ -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