added spawnflags 8 for breakables, lets mappers turn off kicking

This commit is contained in:
Scott Brooks 2002-08-21 02:56:08 +00:00
parent 7bceef7862
commit dffe58447e
3 changed files with 21 additions and 0 deletions

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.117 2002/08/21 02:56:08 blaze
// added spawnflags 8 for breakables, lets mappers turn off kicking
//
// Revision 1.116 2002/08/18 20:26:35 jbravo
// New hitboxes. Fixed CTB awards (flags)
//
@ -1807,6 +1810,10 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
return;
}
if (targ->s.eType == ET_BREAKABLE && targ->unkickable == qtrue){
return;
}
if (g_gametype.integer == GT_TEAMPLAY && level.lights_camera_action) {
return; // JBravo: No dmg during LCA
}

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.114 2002/08/21 02:56:08 blaze
// added spawnflags 8 for breakables, lets mappers turn off kicking
//
// Revision 1.113 2002/08/13 16:59:16 makro
// Fixed per-client callvote limit; added a new cvar - g_RQ3_maxClientVotes
//
@ -421,6 +424,8 @@ struct gentity_s {
qboolean explosive;
//True if it's already been exploded
qboolean exploded;
//Bkaze: allow some entities to be shootable, but not kickable.
qboolean unkickable;
qboolean takedamage;
int damage;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.60 2002/08/21 02:56:08 blaze
// added spawnflags 8 for breakables, lets mappers turn off kicking
//
// Revision 1.59 2002/07/13 22:43:59 makro
// Semi-working fog hull, semi-working sky portals (cgame code commented out)
// Basically, semi-working stuff :P
@ -751,6 +754,12 @@ void SP_func_breakable(gentity_t * ent)
ent->explosive = qfalse;
}
if (ent->spawnflags & 8) {
ent->unkickable = qtrue;
} else {
ent->unkickable = qfalse;
}
if (!ent->damage_radius) {
ent->damage_radius = GRENADE_SPLASH_RADIUS;
}