rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-14 08:50:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Should have fixed the unkickable thing breaking explosive breakables.

Browse source
This commit is contained in:
Scott Brooks 2002-08-23 23:07:01 +00:00
parent 59f1e6ee62
commit 69c79ba832
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.120 2002/08/23 23:07:01 blaze
// Should have fixed the unkickable thing breaking explosive breakables.
//
// Revision 1.119 2002/08/22 05:00:01 blaze // Revision 1.119 2002/08/22 05:00:01 blaze
// Allow func_buttons to be unkickable too (set spawnflags to 8) // Allow func_buttons to be unkickable too (set spawnflags to 8)
// //
@ -1816,10 +1819,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
return; return;
} }
if ( (targ->s.eType == ET_BREAKABLE || targ->s.eType == ET_MOVER) && targ->unkickable == qtrue){
return;
}
if (g_gametype.integer == GT_TEAMPLAY && level.lights_camera_action) { if (g_gametype.integer == GT_TEAMPLAY && level.lights_camera_action) {
return; // JBravo: No dmg during LCA return; // JBravo: No dmg during LCA
} }

5
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.78 2002/08/23 23:07:01 blaze
// Should have fixed the unkickable thing breaking explosive breakables.
//
// Revision 1.77 2002/07/22 07:27:02 niceass // Revision 1.77 2002/07/22 07:27:02 niceass
// better fog laser support // better fog laser support
// //
@ -245,7 +248,7 @@ qboolean JumpKick(gentity_t * ent)
//Makro - this was a few lines below //Makro - this was a few lines below
damage = 20; damage = 20;
if (traceEnt->s.eType == ET_BREAKABLE && (traceEnt->spawnflags & 8) == 8) { if ((traceEnt->s.eType == ET_BREAKABLE || traceEnt->s.eType == ET_MOVER) && traceEnt->unkickable == qtrue ) {
return qfalse; return qfalse;
} }